From owner-p4-projects@FreeBSD.ORG Sun Mar 30 00:04:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 57784106570F; Sun, 30 Mar 2008 00:04:51 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1022610657C0 for ; Sun, 30 Mar 2008 00:04:51 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0034B8FC18 for ; Sun, 30 Mar 2008 00:04:51 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2U04oHj099514 for ; Sun, 30 Mar 2008 00:04:50 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2U04l2d099485 for perforce@freebsd.org; Sun, 30 Mar 2008 00:04:47 GMT (envelope-from jb@freebsd.org) Date: Sun, 30 Mar 2008 00:04:47 GMT Message-Id: <200803300004.m2U04l2d099485@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 138947 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Mar 2008 00:04:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=138947 Change 138947 by jb@jb_freebsd1 on 2008/03/30 00:04:29 IF6 Affected files ... .. //depot/projects/dtrace6/src/Makefile#2 integrate .. //depot/projects/dtrace6/src/UPDATING#5 integrate .. //depot/projects/dtrace6/src/bin/csh/Makefile#2 integrate .. //depot/projects/dtrace6/src/bin/csh/config.h#2 integrate .. //depot/projects/dtrace6/src/bin/csh/config_p.h#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/AUTHORS#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/BUGS#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/COPYING#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/ChangeLog#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/FAQ#1 branch .. //depot/projects/dtrace6/src/contrib/amd/FREEBSD-Xlist#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/FREEBSD-upgrade#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/INSTALL#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/NEWS#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/README.attrcache#1 branch .. //depot/projects/dtrace6/src/contrib/amd/README.ldap#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/am_ops.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/amd.8#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/amd.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/amd.h#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/amfs_auto.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/amfs_direct.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/amfs_error.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/amfs_generic.c#1 branch .. //depot/projects/dtrace6/src/contrib/amd/amd/amfs_host.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/amfs_inherit.c#2 delete .. //depot/projects/dtrace6/src/contrib/amd/amd/amfs_link.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/amfs_linkx.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/amfs_nfsl.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/amfs_nfsx.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/amfs_program.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/amfs_root.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/amfs_toplvl.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/amfs_union.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/amq_subr.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/amq_svc.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/autil.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/clock.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/conf.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/conf_parse.y#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/conf_tok.l#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/get_args.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/info_exec.c#1 branch .. //depot/projects/dtrace6/src/contrib/amd/amd/info_file.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/info_hesiod.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/info_ldap.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/info_ndbm.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/info_nis.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/info_nisplus.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/info_passwd.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/info_union.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/map.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/mapc.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/mntfs.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/nfs_prot_svc.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/nfs_start.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/nfs_subr.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/ops_TEMPLATE.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/ops_cachefs.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/ops_cdfs.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/ops_efs.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/ops_lofs.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/ops_mfs.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/ops_nfs.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/ops_nfs3.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/ops_nullfs.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/ops_pcfs.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/ops_tfs.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/ops_tmpfs.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/ops_ufs.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/ops_umapfs.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/ops_unionfs.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/ops_xfs.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/opts.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/readdir.c#1 branch .. //depot/projects/dtrace6/src/contrib/amd/amd/restart.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/rpc_fwd.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/sched.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/srvr_amfs_auto.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amd/srvr_nfs.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amq/amq.8#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amq/amq.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amq/amq.h#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amq/amq_clnt.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amq/amq_xdr.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amq/pawd.1#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/amq/pawd.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/aux_conf.h.in#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/bootstrap#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/conf/checkmount/checkmount_bsd44.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/conf/mtab/mtab_bsd.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/conf/transp/transp_sockets.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/conf/trap/trap_default.h#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/conf/umount/umount_bsd44.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/doc/am-utils.texi#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/doc/stamp-vti#1 branch .. //depot/projects/dtrace6/src/contrib/amd/doc/texinfo.tex#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/doc/version.texi#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/fixmount/fixmount.8#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/fixmount/fixmount.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/fsinfo/fsi_analyze.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/fsinfo/fsi_data.h#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/fsinfo/fsi_dict.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/fsinfo/fsi_gram.y#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/fsinfo/fsi_lex.l#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/fsinfo/fsi_util.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/fsinfo/fsinfo.8#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/fsinfo/fsinfo.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/fsinfo/fsinfo.h#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/fsinfo/wr_atab.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/fsinfo/wr_bparam.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/fsinfo/wr_dumpset.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/fsinfo/wr_exportfs.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/fsinfo/wr_fstab.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/hlfsd/hlfsd.8#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/hlfsd/hlfsd.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/hlfsd/hlfsd.h#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/hlfsd/homedir.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/hlfsd/nfs_prot_svc.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/hlfsd/stubs.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/include/am_compat.h#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/include/am_defs.h#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/include/am_utils.h#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/include/am_xdr_func.h#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/include/amq_defs.h#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/include/mount_headers1.h#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/include/mount_headers2.h#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/ldap-id.ms#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/ldap.schema#1 branch .. //depot/projects/dtrace6/src/contrib/amd/libamu/alloca.c#2 delete .. //depot/projects/dtrace6/src/contrib/amd/libamu/amu.h#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/libamu/hasmntopt.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/libamu/misc_rpc.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/libamu/mount_fs.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/libamu/mtab.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/libamu/nfs_prot_xdr.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/libamu/strerror.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/libamu/strutil.c#1 branch .. //depot/projects/dtrace6/src/contrib/amd/libamu/util.c#2 delete .. //depot/projects/dtrace6/src/contrib/amd/libamu/wire.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/libamu/xdr_func.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/libamu/xutil.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/m4/GNUmakefile#2 delete .. //depot/projects/dtrace6/src/contrib/amd/m4/amdgrep#2 delete .. //depot/projects/dtrace6/src/contrib/amd/m4/amindent#2 delete .. //depot/projects/dtrace6/src/contrib/amd/m4/autopat#2 delete .. //depot/projects/dtrace6/src/contrib/amd/m4/chop-aclocal.pl#2 delete .. //depot/projects/dtrace6/src/contrib/amd/m4/copy-if-newbig#2 delete .. //depot/projects/dtrace6/src/contrib/amd/m4/macros/HEADER#2 delete .. //depot/projects/dtrace6/src/contrib/amd/m4/macros/TRAILER#2 delete .. //depot/projects/dtrace6/src/contrib/amd/m4/mk-aclocal#2 delete .. //depot/projects/dtrace6/src/contrib/amd/m4/mkconf#2 delete .. //depot/projects/dtrace6/src/contrib/amd/m4/rmtspc#2 delete .. //depot/projects/dtrace6/src/contrib/amd/m4/update_build_version#2 delete .. //depot/projects/dtrace6/src/contrib/amd/mk-amd-map/mk-amd-map.8#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/mk-amd-map/mk-amd-map.c#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/scripts/am-eject.in#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/scripts/amd.conf-sample#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/scripts/amd.conf.5#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/scripts/amd2ldif.in#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/scripts/amd2sun.in#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/scripts/automount2amd.8#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/scripts/automount2amd.in#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/scripts/ctl-amd.in#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/scripts/ctl-hlfsd.in#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/scripts/expn.1#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/scripts/expn.in#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/scripts/fix-amd-map.in#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/scripts/fixrmtab.in#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/scripts/redhat-ctl-amd.in#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/scripts/test-attrcache.in#1 branch .. //depot/projects/dtrace6/src/contrib/amd/scripts/wait4amd.in#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/scripts/wait4amd2die.in#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/tasks#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/vers.m4#1 branch .. //depot/projects/dtrace6/src/contrib/amd/wire-test/wire-test.8#2 integrate .. //depot/projects/dtrace6/src/contrib/amd/wire-test/wire-test.c#2 integrate .. //depot/projects/dtrace6/src/contrib/binutils/libiberty/cp-demangle.c#2 integrate .. //depot/projects/dtrace6/src/contrib/cvs/src/log.c#2 integrate .. //depot/projects/dtrace6/src/contrib/file/ChangeLog#3 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/acorn#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/animation#3 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/apple#3 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/archive#3 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/audio#3 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/bFLT#2 delete .. //depot/projects/dtrace6/src/contrib/file/Magdir/blender#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/chi#2 delete .. //depot/projects/dtrace6/src/contrib/file/Magdir/commands#3 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/console#3 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/cvs#2 delete .. //depot/projects/dtrace6/src/contrib/file/Magdir/database#3 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/efi#1 branch .. //depot/projects/dtrace6/src/contrib/file/Magdir/elf#3 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/filesystems#3 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/fortran#1 branch .. //depot/projects/dtrace6/src/contrib/file/Magdir/hdf#2 delete .. //depot/projects/dtrace6/src/contrib/file/Magdir/impulse#2 delete .. //depot/projects/dtrace6/src/contrib/file/Magdir/java#3 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/macintosh#3 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/msdos#3 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/pdf#2 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/sgi#3 integrate .. //depot/projects/dtrace6/src/contrib/file/Magdir/wordperfect#2 delete .. //depot/projects/dtrace6/src/contrib/file/Makefile.am#3 integrate .. //depot/projects/dtrace6/src/contrib/file/Makefile.in#3 integrate .. //depot/projects/dtrace6/src/contrib/file/acconfig.h#2 delete .. //depot/projects/dtrace6/src/contrib/file/acinclude.m4#2 integrate .. //depot/projects/dtrace6/src/contrib/file/aclocal.m4#3 integrate .. //depot/projects/dtrace6/src/contrib/file/apprentice.c#3 integrate .. //depot/projects/dtrace6/src/contrib/file/ascmagic.c#3 integrate .. //depot/projects/dtrace6/src/contrib/file/compress.c#3 integrate .. //depot/projects/dtrace6/src/contrib/file/config.h.in#3 integrate .. //depot/projects/dtrace6/src/contrib/file/configure#3 integrate .. //depot/projects/dtrace6/src/contrib/file/configure.in#3 integrate .. //depot/projects/dtrace6/src/contrib/file/file.c#3 integrate .. //depot/projects/dtrace6/src/contrib/file/file.h#3 integrate .. //depot/projects/dtrace6/src/contrib/file/file.man#3 integrate .. //depot/projects/dtrace6/src/contrib/file/file_opts.h#1 branch .. //depot/projects/dtrace6/src/contrib/file/fsmagic.c#3 integrate .. //depot/projects/dtrace6/src/contrib/file/funcs.c#3 integrate .. //depot/projects/dtrace6/src/contrib/file/install-sh#3 integrate .. //depot/projects/dtrace6/src/contrib/file/is_tar.c#3 integrate .. //depot/projects/dtrace6/src/contrib/file/libmagic.man#3 integrate .. //depot/projects/dtrace6/src/contrib/file/magic.c#3 integrate .. //depot/projects/dtrace6/src/contrib/file/magic.h#3 integrate .. //depot/projects/dtrace6/src/contrib/file/magic.man#3 integrate .. //depot/projects/dtrace6/src/contrib/file/magic.mime#3 integrate .. //depot/projects/dtrace6/src/contrib/file/missing#2 delete .. //depot/projects/dtrace6/src/contrib/file/mkinstalldirs#3 integrate .. //depot/projects/dtrace6/src/contrib/file/names.h#3 integrate .. //depot/projects/dtrace6/src/contrib/file/patchlevel.h#3 integrate .. //depot/projects/dtrace6/src/contrib/file/print.c#3 integrate .. //depot/projects/dtrace6/src/contrib/file/readelf.c#3 integrate .. //depot/projects/dtrace6/src/contrib/file/readelf.h#3 integrate .. //depot/projects/dtrace6/src/contrib/file/softmagic.c#3 integrate .. //depot/projects/dtrace6/src/contrib/file/stamp-h.in#2 delete .. //depot/projects/dtrace6/src/contrib/gcc/config/sparc/freebsd.h#2 integrate .. //depot/projects/dtrace6/src/contrib/pf/man/pf.conf.5#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/FREEBSD-Xlist#2 delete .. //depot/projects/dtrace6/src/contrib/tcsh/FREEBSD-upgrade#2 delete .. //depot/projects/dtrace6/src/contrib/tcsh/Fixes#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/Imakefile#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/MAKEDIFFS#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/MAKESHAR#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/Makefile.in#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/Makefile.std#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/Makefile.vms#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/README#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/complete.tcsh#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/config.h.in#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/config/bsd4.4#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/config_f.h#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/configure#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/configure.in#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/ed.chared.c#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/ed.decls.h#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/ed.defns.c#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/ed.h#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/ed.init.c#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/ed.inputl.c#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/ed.refresh.c#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/ed.screen.c#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/ed.term.c#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/ed.term.h#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/ed.xmap.c#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/eight-bit.me#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/gethost.c#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/glob.c#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/glob.h#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/host.defs#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/imake.config#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/ma.setp.c#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/mi.termios.c#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/mi.varargs.h#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/C/set1#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/C/set10#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/C/set11#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/C/set12#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/C/set13#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/C/set14#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/C/set15#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/C/set16#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/C/set17#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/C/set18#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/C/set19#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/C/set2#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/C/set20#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/C/set21#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/C/set22#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/C/set23#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/C/set24#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/C/set25#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/C/set26#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/C/set27#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/C/set29#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/C/set3#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/C/set30#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/C/set31#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/C/set4#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/C/set5#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/C/set6#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/C/set7#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/C/set8#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/C/set9#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/Makefile#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/et/set1#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/et/set10#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/et/set11#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/et/set12#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/et/set13#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/et/set14#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/et/set15#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/et/set16#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/et/set17#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/et/set18#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/et/set19#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/et/set2#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/et/set20#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/et/set21#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/et/set22#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/et/set23#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/et/set24#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/et/set25#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/et/set26#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/et/set27#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/et/set29#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/et/set3#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/et/set30#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/et/set31#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/et/set4#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/et/set5#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/et/set6#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/et/set7#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/et/set8#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/et/set9#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/finnish/set1#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/finnish/set10#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/finnish/set11#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/finnish/set12#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/finnish/set13#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/finnish/set14#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/finnish/set15#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/finnish/set16#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/finnish/set17#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/finnish/set18#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/finnish/set19#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/finnish/set2#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/finnish/set20#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/finnish/set21#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/finnish/set22#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/finnish/set23#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/finnish/set24#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/finnish/set25#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/finnish/set26#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/finnish/set27#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/finnish/set29#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/finnish/set3#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/finnish/set30#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/finnish/set31#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/finnish/set4#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/finnish/set5#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/finnish/set6#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/finnish/set7#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/finnish/set8#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/finnish/set9#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/french/set1#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/french/set10#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/french/set11#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/french/set12#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/french/set13#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/french/set14#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/french/set15#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/french/set16#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/french/set17#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/french/set18#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/french/set19#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/french/set2#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/french/set20#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/french/set21#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/french/set22#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/french/set23#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/french/set24#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/french/set25#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/french/set26#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/french/set27#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/french/set29#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/french/set3#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/french/set30#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/french/set31#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/french/set4#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/french/set5#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/french/set6#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/french/set7#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/french/set8#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/french/set9#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/german/set1#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/german/set10#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/german/set11#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/german/set12#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/german/set13#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/german/set14#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/german/set15#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/german/set16#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/german/set17#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/german/set18#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/german/set19#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/german/set2#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/german/set20#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/german/set21#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/german/set22#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/german/set23#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/german/set24#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/german/set25#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/german/set26#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/german/set27#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/german/set29#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/german/set3#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/german/set30#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/german/set31#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/german/set4#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/german/set5#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/german/set6#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/german/set7#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/german/set8#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/german/set9#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/greek/set1#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/greek/set10#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/greek/set11#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/greek/set12#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/greek/set13#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/greek/set14#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/greek/set15#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/greek/set16#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/greek/set17#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/greek/set18#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/greek/set19#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/greek/set2#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/greek/set20#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/greek/set21#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/greek/set22#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/greek/set23#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/greek/set24#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/greek/set25#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/greek/set26#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/greek/set27#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/greek/set29#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/greek/set3#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/greek/set30#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/greek/set31#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/greek/set4#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/greek/set5#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/greek/set6#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/greek/set7#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/greek/set8#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/greek/set9#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/italian/set1#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/italian/set10#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/italian/set11#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/italian/set12#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/italian/set13#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/italian/set14#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/italian/set15#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/italian/set16#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/italian/set17#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/italian/set18#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/italian/set19#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/italian/set2#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/italian/set20#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/italian/set21#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/italian/set22#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/italian/set23#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/italian/set24#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/italian/set25#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/italian/set26#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/italian/set27#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/italian/set29#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/italian/set3#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/italian/set30#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/italian/set31#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/italian/set4#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/italian/set5#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/italian/set6#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/italian/set7#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/italian/set8#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/italian/set9#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/ja/set1#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/ja/set10#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/ja/set11#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/ja/set12#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/ja/set13#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/ja/set15#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/ja/set16#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/ja/set17#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/ja/set18#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/ja/set2#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/ja/set21#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/ja/set24#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/ja/set29#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/ja/set3#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/ja/set30#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/ja/set4#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/ja/set5#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/ja/set6#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/ja/set7#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/ja/set8#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/pl/set1#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/pl/set10#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/pl/set11#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/pl/set12#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/pl/set13#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/pl/set14#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/pl/set15#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/pl/set16#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/pl/set17#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/pl/set18#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/pl/set19#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/pl/set2#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/pl/set20#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/pl/set21#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/pl/set22#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/pl/set23#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/pl/set24#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/pl/set25#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/pl/set26#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/pl/set27#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/pl/set29#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/pl/set3#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/pl/set30#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/pl/set31#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/pl/set4#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/pl/set5#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/pl/set6#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/pl/set7#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/pl/set8#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/pl/set9#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/russian/set1#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/russian/set10#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/russian/set11#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/russian/set12#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/russian/set13#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/russian/set14#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/russian/set15#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/russian/set16#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/russian/set17#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/russian/set18#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/russian/set19#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/russian/set2#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/russian/set20#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/russian/set21#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/russian/set22#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/russian/set23#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/russian/set24#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/russian/set25#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/russian/set26#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/russian/set27#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/russian/set29#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/russian/set3#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/russian/set30#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/russian/set31#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/russian/set4#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/russian/set5#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/russian/set6#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/russian/set7#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/russian/set8#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/russian/set9#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/spanish/set1#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/spanish/set10#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/spanish/set11#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/spanish/set12#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/spanish/set13#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/spanish/set14#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/spanish/set15#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/spanish/set16#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/spanish/set17#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/spanish/set18#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/spanish/set19#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/spanish/set2#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/spanish/set20#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/spanish/set21#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/spanish/set22#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/spanish/set23#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/spanish/set24#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/spanish/set25#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/spanish/set26#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/spanish/set27#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/spanish/set29#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/spanish/set3#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/spanish/set30#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/spanish/set31#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/spanish/set4#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/spanish/set5#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/spanish/set6#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/spanish/set7#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/spanish/set8#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/spanish/set9#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/ukrainian/set1#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/ukrainian/set10#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/ukrainian/set11#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/ukrainian/set12#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/ukrainian/set13#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/ukrainian/set14#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/ukrainian/set15#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/ukrainian/set16#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/ukrainian/set17#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/ukrainian/set18#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/ukrainian/set19#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/ukrainian/set2#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/ukrainian/set20#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/ukrainian/set21#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/ukrainian/set22#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/ukrainian/set23#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/ukrainian/set24#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/ukrainian/set25#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/ukrainian/set26#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/ukrainian/set27#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/ukrainian/set29#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/ukrainian/set3#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/ukrainian/set30#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/ukrainian/set31#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/ukrainian/set4#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/ukrainian/set5#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/ukrainian/set6#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/ukrainian/set7#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/ukrainian/set8#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/nls/ukrainian/set9#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/patchlevel.h#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/pathnames.h#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/sh.c#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/sh.char.c#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/sh.char.h#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/sh.decls.h#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/sh.dir.c#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/sh.dir.h#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/sh.dol.c#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/sh.err.c#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/sh.exec.c#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/sh.exp.c#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/sh.file.c#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/sh.func.c#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/sh.glob.c#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/sh.h#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/sh.hist.c#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/sh.init.c#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/sh.lex.c#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/sh.misc.c#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/sh.parse.c#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/sh.print.c#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/sh.proc.c#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/sh.proc.h#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/sh.sem.c#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/sh.set.c#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/sh.time.c#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/sh.types.h#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/snames.h#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/tc.alloc.c#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/tc.bind.c#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/tc.const.c#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/tc.decls.h#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/tc.disc.c#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/tc.func.c#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/tc.h#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/tc.nls.c#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/tc.nls.h#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/tc.os.c#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/tc.os.h#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/tc.printf.c#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/tc.prompt.c#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/tc.sched.c#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/tc.sig.c#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/tc.sig.h#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/tc.str.c#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/tc.vers.c#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/tc.wait.h#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/tc.who.c#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/tcsh.man#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/tcsh.man2html#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/termcap.vms#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/tw.color.c#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/tw.comp.c#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/tw.decls.h#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/tw.h#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/tw.help.c#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/tw.init.c#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/tw.parse.c#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/tw.spell.c#2 integrate .. //depot/projects/dtrace6/src/contrib/tcsh/vms.termcap.c#2 integrate .. //depot/projects/dtrace6/src/etc/defaults/rc.conf#4 integrate .. //depot/projects/dtrace6/src/etc/mail/access.sample#2 integrate .. //depot/projects/dtrace6/src/etc/namedb/named.root#3 integrate .. //depot/projects/dtrace6/src/etc/periodic/security/100.chksetuid#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/DAEMON#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/LOGIN#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/Makefile#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/NETWORKING#3 integrate .. //depot/projects/dtrace6/src/etc/rc.d/SERVERS#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/accounting#3 integrate .. //depot/projects/dtrace6/src/etc/rc.d/amd#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/apmd#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/bootconf.sh#3 delete .. //depot/projects/dtrace6/src/etc/rc.d/bootparams#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/ccd#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/cron#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/dhclient#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/dmesg#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/fsck#3 integrate .. //depot/projects/dtrace6/src/etc/rc.d/ike#2 delete .. //depot/projects/dtrace6/src/etc/rc.d/inetd#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/ipfilter#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/ipfs#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/ipmon#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/ipnat#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/ipsec#3 integrate .. //depot/projects/dtrace6/src/etc/rc.d/isdnd#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/jail#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/kerberos#4 integrate .. //depot/projects/dtrace6/src/etc/rc.d/keyserv#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/ldconfig#4 integrate .. //depot/projects/dtrace6/src/etc/rc.d/local#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/lockd#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/lpd#3 integrate .. //depot/projects/dtrace6/src/etc/rc.d/motd#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/mountcritlocal#3 integrate .. //depot/projects/dtrace6/src/etc/rc.d/mountcritremote#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/mountd#3 integrate .. //depot/projects/dtrace6/src/etc/rc.d/mountlate#3 integrate .. //depot/projects/dtrace6/src/etc/rc.d/moused#3 integrate .. //depot/projects/dtrace6/src/etc/rc.d/mrouted#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/newsyslog#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/nfsd#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/nfslocking#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/power_profile#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/pwcheck#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/quota#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/rarpd#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/resolv#3 integrate .. //depot/projects/dtrace6/src/etc/rc.d/root#3 integrate .. //depot/projects/dtrace6/src/etc/rc.d/route6d#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/routed#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/rpcbind#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/rtadvd#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/rwho#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/savecore#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/securelevel#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/sendmail#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/sshd#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/statd#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/swap1#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/sysctl#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/syslogd#3 integrate .. //depot/projects/dtrace6/src/etc/rc.d/timed#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/tmp#3 integrate .. //depot/projects/dtrace6/src/etc/rc.d/ugidfw#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/var#3 integrate .. //depot/projects/dtrace6/src/etc/rc.d/virecover#2 integrate .. //depot/projects/dtrace6/src/etc/rc.d/ypbind#3 integrate .. //depot/projects/dtrace6/src/etc/rc.d/yppasswdd#3 integrate .. //depot/projects/dtrace6/src/etc/rc.d/ypserv#3 integrate .. //depot/projects/dtrace6/src/etc/sendmail/freebsd.mc#3 integrate .. //depot/projects/dtrace6/src/gnu/usr.bin/gdb/kgdb/Makefile#2 integrate .. //depot/projects/dtrace6/src/gnu/usr.bin/gdb/kgdb/kgdb.h#5 integrate .. //depot/projects/dtrace6/src/gnu/usr.bin/gdb/kgdb/kld.c#1 branch .. //depot/projects/dtrace6/src/gnu/usr.bin/gdb/kgdb/kthr.c#4 integrate .. //depot/projects/dtrace6/src/gnu/usr.bin/gdb/kgdb/main.c#2 integrate .. //depot/projects/dtrace6/src/gnu/usr.bin/gdb/kgdb/trgt.c#3 integrate .. //depot/projects/dtrace6/src/gnu/usr.bin/gdb/kgdb/trgt_i386.c#3 integrate .. //depot/projects/dtrace6/src/lib/libarchive/archive_read.c#2 integrate .. //depot/projects/dtrace6/src/lib/libarchive/archive_read_private.h#2 integrate .. //depot/projects/dtrace6/src/lib/libarchive/archive_write_set_compression_bzip2.c#2 integrate .. //depot/projects/dtrace6/src/lib/libarchive/archive_write_set_compression_gzip.c#2 integrate .. //depot/projects/dtrace6/src/lib/libarchive/archive_write_set_format_ar.c#2 integrate .. //depot/projects/dtrace6/src/lib/libc/gen/sysconf.c#2 integrate .. //depot/projects/dtrace6/src/lib/libc/locale/setrunelocale.c#4 integrate .. //depot/projects/dtrace6/src/lib/libc/resolv/res_comp.c#2 integrate .. //depot/projects/dtrace6/src/lib/libc/stdio/fdopen.c#2 integrate .. //depot/projects/dtrace6/src/lib/libc/stdio/fopen.c#2 integrate .. //depot/projects/dtrace6/src/lib/libc/stdio/freopen.c#2 integrate .. //depot/projects/dtrace6/src/lib/libc/sys/access.2#2 integrate .. //depot/projects/dtrace6/src/lib/libc/sys/clock_gettime.2#2 integrate .. //depot/projects/dtrace6/src/lib/libdisk/disk.c#2 integrate .. //depot/projects/dtrace6/src/lib/libkvm/kvm.c#2 integrate .. //depot/projects/dtrace6/src/lib/libmagic/config.h#3 integrate .. //depot/projects/dtrace6/src/lib/libmilter/Makefile#2 integrate .. //depot/projects/dtrace6/src/lib/libpthread/sys/lock.c#2 integrate .. //depot/projects/dtrace6/src/lib/libpthread/thread/thr_kern.c#2 integrate .. //depot/projects/dtrace6/src/lib/libsdp/sdp.h#2 integrate .. //depot/projects/dtrace6/src/lib/ncurses/ncurses/Makefile#2 integrate .. //depot/projects/dtrace6/src/release/doc/en_US.ISO8859-1/errata/article.sgml#3 integrate .. //depot/projects/dtrace6/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#7 integrate .. //depot/projects/dtrace6/src/release/fixit.profile#4 integrate .. //depot/projects/dtrace6/src/sbin/bsdlabel/bsdlabel.8#2 integrate .. //depot/projects/dtrace6/src/sbin/dhclient/dhclient-script#4 integrate .. //depot/projects/dtrace6/src/sbin/ffsinfo/ffsinfo.c#2 integrate .. //depot/projects/dtrace6/src/sbin/geom/core/geom.8#2 integrate .. //depot/projects/dtrace6/src/sbin/geom/core/geom.c#2 integrate .. //depot/projects/dtrace6/src/sbin/gpt/gpt.c#4 integrate .. //depot/projects/dtrace6/src/sbin/natd/natd.8#2 integrate .. //depot/projects/dtrace6/src/sbin/newfs/newfs.8#2 integrate .. //depot/projects/dtrace6/src/sbin/route/route.c#2 integrate .. //depot/projects/dtrace6/src/sbin/setkey/parse.y#2 integrate .. //depot/projects/dtrace6/src/secure/usr.bin/ssh/Makefile#2 integrate .. //depot/projects/dtrace6/src/secure/usr.sbin/sshd/Makefile#2 integrate .. //depot/projects/dtrace6/src/share/colldef/el_GR.ISO8859-7.src#2 integrate .. //depot/projects/dtrace6/src/share/examples/cvsup/cvs-supfile#2 integrate .. //depot/projects/dtrace6/src/share/man/man4/fwohci.4#2 integrate .. //depot/projects/dtrace6/src/share/man/man4/hptrr.4#2 integrate .. //depot/projects/dtrace6/src/share/man/man4/man4.i386/ar.4#2 integrate .. //depot/projects/dtrace6/src/share/man/man4/man4.i386/linux.4#2 integrate .. //depot/projects/dtrace6/src/share/man/man4/man4.i386/pnp.4#2 integrate .. //depot/projects/dtrace6/src/share/man/man4/man4.i386/scd.4#2 integrate .. //depot/projects/dtrace6/src/share/man/man4/man4.i386/streams.4#2 integrate .. //depot/projects/dtrace6/src/share/man/man4/man4.i386/svr4.4#2 integrate .. //depot/projects/dtrace6/src/share/man/man4/msk.4#3 integrate .. //depot/projects/dtrace6/src/share/man/man4/mxge.4#3 integrate .. //depot/projects/dtrace6/src/share/man/man4/ng_nat.4#2 integrate .. //depot/projects/dtrace6/src/share/man/man4/ng_pppoe.4#2 integrate .. //depot/projects/dtrace6/src/share/man/man4/nve.4#2 integrate .. //depot/projects/dtrace6/src/share/man/man4/ucycom.4#2 integrate .. //depot/projects/dtrace6/src/share/man/man5/hosts.equiv.5#2 integrate .. //depot/projects/dtrace6/src/share/man/man5/rc.conf.5#3 integrate .. //depot/projects/dtrace6/src/share/man/man9/Makefile#3 integrate .. //depot/projects/dtrace6/src/share/man/man9/ieee80211_radiotap.9#2 integrate .. //depot/projects/dtrace6/src/share/mk/bsd.cpu.mk#2 integrate .. //depot/projects/dtrace6/src/share/termcap/termcap.src#2 integrate .. //depot/projects/dtrace6/src/share/zoneinfo/Makefile#4 integrate .. //depot/projects/dtrace6/src/share/zoneinfo/asia#4 integrate .. //depot/projects/dtrace6/src/share/zoneinfo/backward#3 integrate .. //depot/projects/dtrace6/src/share/zoneinfo/leapseconds#2 integrate .. //depot/projects/dtrace6/src/share/zoneinfo/northamerica#3 integrate .. //depot/projects/dtrace6/src/share/zoneinfo/southamerica#4 integrate .. //depot/projects/dtrace6/src/share/zoneinfo/zone.tab#3 integrate .. //depot/projects/dtrace6/src/sys/amd64/acpica/madt.c#3 integrate .. //depot/projects/dtrace6/src/sys/amd64/amd64/amd64_mem.c#2 integrate .. //depot/projects/dtrace6/src/sys/amd64/amd64/busdma_machdep.c#2 integrate .. //depot/projects/dtrace6/src/sys/amd64/amd64/machdep.c#4 integrate .. //depot/projects/dtrace6/src/sys/amd64/amd64/mem.c#2 integrate .. //depot/projects/dtrace6/src/sys/amd64/ia32/ia32_signal.c#2 integrate .. //depot/projects/dtrace6/src/sys/amd64/include/pc/bios.h#2 integrate .. //depot/projects/dtrace6/src/sys/amd64/include/proc.h#2 integrate .. //depot/projects/dtrace6/src/sys/amd64/include/specialreg.h#3 integrate .. //depot/projects/dtrace6/src/sys/amd64/isa/clock.c#2 integrate .. //depot/projects/dtrace6/src/sys/amd64/linux32/linux32_machdep.c#2 integrate .. //depot/projects/dtrace6/src/sys/amd64/linux32/linux32_sysvec.c#2 integrate .. //depot/projects/dtrace6/src/sys/arm/arm/busdma_machdep.c#3 integrate .. //depot/projects/dtrace6/src/sys/arm/arm/uio_machdep.c#2 integrate .. //depot/projects/dtrace6/src/sys/boot/i386/boot2/boot2.c#3 integrate .. //depot/projects/dtrace6/src/sys/boot/i386/btx/btx/Makefile#2 integrate .. //depot/projects/dtrace6/src/sys/boot/i386/btx/btx/btx.S#2 integrate .. //depot/projects/dtrace6/src/sys/boot/i386/gptboot/gptboot.c#2 integrate .. //depot/projects/dtrace6/src/sys/boot/i386/libi386/biosmem.c#2 integrate .. //depot/projects/dtrace6/src/sys/boot/i386/libi386/biossmap.c#2 integrate .. //depot/projects/dtrace6/src/sys/cam/cam_xpt.c#2 integrate .. //depot/projects/dtrace6/src/sys/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/dtrace6/src/sys/conf/NOTES#2 integrate .. //depot/projects/dtrace6/src/sys/conf/files#4 integrate .. //depot/projects/dtrace6/src/sys/conf/files.amd64#5 integrate .. //depot/projects/dtrace6/src/sys/conf/files.i386#5 integrate .. //depot/projects/dtrace6/src/sys/conf/files.sparc64#3 integrate .. //depot/projects/dtrace6/src/sys/conf/kmod.mk#2 integrate .. //depot/projects/dtrace6/src/sys/ddb/db_command.c#4 integrate .. //depot/projects/dtrace6/src/sys/ddb/db_input.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/aac/aac.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/acpica/acpi_cpu.c#4 integrate .. //depot/projects/dtrace6/src/sys/dev/acpica/acpi_thermal.c#3 integrate .. //depot/projects/dtrace6/src/sys/dev/ata/ata-disk.c#3 integrate .. //depot/projects/dtrace6/src/sys/dev/bfe/if_bfe.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/bfe/if_bfereg.h#2 integrate .. //depot/projects/dtrace6/src/sys/dev/bge/if_bge.c#3 integrate .. //depot/projects/dtrace6/src/sys/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/dtrace6/src/sys/dev/coretemp/coretemp.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/drm/drm_drv.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/drm/drm_pciids.h#2 integrate .. //depot/projects/dtrace6/src/sys/dev/drm/i915_dma.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/ichwd/ichwd.c#3 integrate .. //depot/projects/dtrace6/src/sys/dev/ichwd/ichwd.h#3 integrate .. //depot/projects/dtrace6/src/sys/dev/le/am7990.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/le/am79900.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/lge/if_lge.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/mfi/mfi.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/mfi/mfireg.h#2 integrate .. //depot/projects/dtrace6/src/sys/dev/mii/brgphy.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/mii/e1000phy.c#3 integrate .. //depot/projects/dtrace6/src/sys/dev/mii/icsphy.c#1 branch .. //depot/projects/dtrace6/src/sys/dev/mii/icsphyreg.h#1 branch .. //depot/projects/dtrace6/src/sys/dev/mii/miidevs#3 integrate .. //depot/projects/dtrace6/src/sys/dev/mii/nsphy.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/mii/nsphyter.c#1 branch .. //depot/projects/dtrace6/src/sys/dev/mii/nsphyterreg.h#1 branch .. //depot/projects/dtrace6/src/sys/dev/msk/if_msk.c#3 integrate .. //depot/projects/dtrace6/src/sys/dev/msk/if_mskreg.h#3 integrate .. //depot/projects/dtrace6/src/sys/dev/mxge/if_mxge.c#3 integrate .. //depot/projects/dtrace6/src/sys/dev/mxge/if_mxge_var.h#3 integrate .. //depot/projects/dtrace6/src/sys/dev/mxge/mxge_lro.c#3 integrate .. //depot/projects/dtrace6/src/sys/dev/mxge/mxge_mcp.h#3 integrate .. //depot/projects/dtrace6/src/sys/dev/mxge/mxge_rss_eth_z8e.c#1 branch .. //depot/projects/dtrace6/src/sys/dev/mxge/mxge_rss_ethp_z8e.c#1 branch .. //depot/projects/dtrace6/src/sys/dev/mxge/rss_eth_z8e.h#1 branch .. //depot/projects/dtrace6/src/sys/dev/mxge/rss_ethp_z8e.h#1 branch .. //depot/projects/dtrace6/src/sys/dev/pci/pci.c#3 integrate .. //depot/projects/dtrace6/src/sys/dev/re/if_re.c#5 integrate .. //depot/projects/dtrace6/src/sys/dev/twe/twe.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/usb/ehci_pci.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/usb/ucom.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/usb/umass.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/usb/usbdevs#3 integrate .. //depot/projects/dtrace6/src/sys/dev/usb/uscanner.c#3 integrate .. //depot/projects/dtrace6/src/sys/fs/nullfs/null_vfsops.c#2 integrate .. //depot/projects/dtrace6/src/sys/fs/nwfs/nwfs_vfsops.c#2 integrate .. //depot/projects/dtrace6/src/sys/fs/smbfs/smbfs_vfsops.c#2 integrate .. //depot/projects/dtrace6/src/sys/fs/udf/udf_vfsops.c#2 integrate .. //depot/projects/dtrace6/src/sys/geom/vinum/geom_vinum_drive.c#2 integrate .. //depot/projects/dtrace6/src/sys/i386/acpica/madt.c#3 integrate .. //depot/projects/dtrace6/src/sys/i386/cpufreq/est.c#2 integrate .. //depot/projects/dtrace6/src/sys/i386/i386/busdma_machdep.c#2 integrate .. //depot/projects/dtrace6/src/sys/i386/i386/i686_mem.c#2 integrate .. //depot/projects/dtrace6/src/sys/i386/i386/identcpu.c#3 integrate .. //depot/projects/dtrace6/src/sys/i386/i386/initcpu.c#2 integrate .. //depot/projects/dtrace6/src/sys/i386/i386/k6_mem.c#2 integrate .. //depot/projects/dtrace6/src/sys/i386/i386/machdep.c#3 integrate .. //depot/projects/dtrace6/src/sys/i386/include/pc/bios.h#2 integrate .. //depot/projects/dtrace6/src/sys/i386/include/proc.h#2 integrate .. //depot/projects/dtrace6/src/sys/i386/include/specialreg.h#3 integrate .. //depot/projects/dtrace6/src/sys/i386/isa/clock.c#2 integrate .. //depot/projects/dtrace6/src/sys/i386/linux/linux_machdep.c#2 integrate .. //depot/projects/dtrace6/src/sys/i386/linux/linux_sysvec.c#2 integrate .. //depot/projects/dtrace6/src/sys/i386/svr4/svr4_machdep.c#2 integrate .. //depot/projects/dtrace6/src/sys/ia64/ia64/busdma_machdep.c#2 integrate .. //depot/projects/dtrace6/src/sys/kern/init_main.c#3 integrate .. //depot/projects/dtrace6/src/sys/kern/kern_descrip.c#2 integrate .. //depot/projects/dtrace6/src/sys/kern/kern_resource.c#2 integrate .. //depot/projects/dtrace6/src/sys/kern/uipc_sem.c#2 integrate .. //depot/projects/dtrace6/src/sys/kern/uipc_syscalls.c#2 integrate .. //depot/projects/dtrace6/src/sys/kern/vfs_default.c#2 integrate .. //depot/projects/dtrace6/src/sys/kern/vfs_vnops.c#3 integrate .. //depot/projects/dtrace6/src/sys/kern/vnode_if.src#2 integrate .. //depot/projects/dtrace6/src/sys/modules/mii/Makefile#2 integrate .. //depot/projects/dtrace6/src/sys/modules/mxge/Makefile#2 integrate .. //depot/projects/dtrace6/src/sys/modules/mxge/mxge_rss_eth_z8e/Makefile#1 branch .. //depot/projects/dtrace6/src/sys/modules/mxge/mxge_rss_ethp_z8e/Makefile#1 branch .. //depot/projects/dtrace6/src/sys/net/bpf.c#3 integrate .. //depot/projects/dtrace6/src/sys/net/bpf.h#2 integrate .. //depot/projects/dtrace6/src/sys/net/netisr.h#2 integrate .. //depot/projects/dtrace6/src/sys/net80211/ieee80211_input.c#3 integrate .. //depot/projects/dtrace6/src/sys/netgraph/netflow/netflow.c#2 integrate .. //depot/projects/dtrace6/src/sys/netgraph/netflow/ng_netflow.c#2 integrate .. //depot/projects/dtrace6/src/sys/netgraph/netgraph.h#4 integrate .. //depot/projects/dtrace6/src/sys/netgraph/ng_base.c#5 integrate .. //depot/projects/dtrace6/src/sys/netgraph/ng_bpf.c#2 integrate .. //depot/projects/dtrace6/src/sys/netgraph/ng_iface.c#2 integrate .. //depot/projects/dtrace6/src/sys/netgraph/ng_ksocket.c#2 integrate .. //depot/projects/dtrace6/src/sys/netgraph/ng_l2tp.c#4 integrate .. //depot/projects/dtrace6/src/sys/netgraph/ng_nat.c#2 integrate .. //depot/projects/dtrace6/src/sys/netgraph/ng_nat.h#2 integrate .. //depot/projects/dtrace6/src/sys/netgraph/ng_ppp.c#3 integrate .. //depot/projects/dtrace6/src/sys/netgraph/ng_pppoe.c#4 integrate .. //depot/projects/dtrace6/src/sys/netgraph/ng_socket.c#3 integrate .. //depot/projects/dtrace6/src/sys/netgraph/ng_tee.c#2 integrate .. //depot/projects/dtrace6/src/sys/netinet/in.c#2 integrate .. //depot/projects/dtrace6/src/sys/netinet/ip_carp.c#2 integrate .. //depot/projects/dtrace6/src/sys/netinet/libalias/alias_db.c#2 integrate .. //depot/projects/dtrace6/src/sys/netinet/libalias/alias_irc.c#2 integrate .. //depot/projects/dtrace6/src/sys/netipsec/ipsec.c#2 integrate .. //depot/projects/dtrace6/src/sys/netipsec/ipsec_input.c#2 integrate .. //depot/projects/dtrace6/src/sys/netipsec/ipsec_output.c#2 integrate .. //depot/projects/dtrace6/src/sys/netipsec/key.c#2 integrate .. //depot/projects/dtrace6/src/sys/netipsec/xform_ipip.c#2 integrate .. //depot/projects/dtrace6/src/sys/nfsclient/nfs_socket.c#4 integrate .. //depot/projects/dtrace6/src/sys/nfsclient/nfs_subs.c#3 integrate .. //depot/projects/dtrace6/src/sys/nfsclient/nfs_vnops.c#2 integrate .. //depot/projects/dtrace6/src/sys/nfsclient/nfsm_subs.h#2 integrate .. //depot/projects/dtrace6/src/sys/nfsserver/nfs_srvcache.c#2 integrate .. //depot/projects/dtrace6/src/sys/nfsserver/nfsrvcache.h#2 integrate .. //depot/projects/dtrace6/src/sys/pc98/include/md_var.h#2 integrate .. //depot/projects/dtrace6/src/sys/pc98/pc98/machdep.c#3 integrate .. //depot/projects/dtrace6/src/sys/pc98/pc98/pc98_machdep.c#2 integrate .. //depot/projects/dtrace6/src/sys/pci/agp_nvidia.c#3 integrate .. //depot/projects/dtrace6/src/sys/pci/if_rlreg.h#3 integrate .. //depot/projects/dtrace6/src/sys/pci/if_ti.c#2 integrate .. //depot/projects/dtrace6/src/sys/security/audit/audit_bsm.c#4 integrate .. //depot/projects/dtrace6/src/sys/security/audit/audit_syscalls.c#3 integrate .. //depot/projects/dtrace6/src/sys/security/mac_mls/mac_mls.c#2 integrate .. //depot/projects/dtrace6/src/sys/sparc64/include/md_var.h#2 integrate .. //depot/projects/dtrace6/src/sys/sparc64/sparc64/ata_machdep.c#1 branch .. //depot/projects/dtrace6/src/sys/sys/mount.h#2 integrate .. //depot/projects/dtrace6/src/sys/sys/vnode.h#2 integrate .. //depot/projects/dtrace6/src/sys/ufs/ffs/ffs_alloc.c#3 integrate .. //depot/projects/dtrace6/src/sys/ufs/ffs/ffs_balloc.c#2 integrate .. //depot/projects/dtrace6/src/sys/ufs/ffs/ffs_inode.c#2 integrate .. //depot/projects/dtrace6/src/sys/ufs/ffs/ffs_rawread.c#2 integrate .. //depot/projects/dtrace6/src/sys/ufs/ffs/ffs_snapshot.c#2 integrate .. //depot/projects/dtrace6/src/sys/ufs/ffs/ffs_softdep.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Mar 30 00:41:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 14AC5106566B; Sun, 30 Mar 2008 00:41:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C7DCD1065676 for ; Sun, 30 Mar 2008 00:41:29 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B999B8FC1C for ; Sun, 30 Mar 2008 00:41:29 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2U0fTBT001549 for ; Sun, 30 Mar 2008 00:41:29 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2U0fTU8001547 for perforce@freebsd.org; Sun, 30 Mar 2008 00:41:29 GMT (envelope-from jb@freebsd.org) Date: Sun, 30 Mar 2008 00:41:29 GMT Message-Id: <200803300041.m2U0fTU8001547@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 138952 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Mar 2008 00:41:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=138952 Change 138952 by jb@jb_freebsd1 on 2008/03/30 00:41:26 More merges caused by the CDDL file move. Grumble. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/kern/opensolaris.c#1 add .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/kern/opensolaris_cmn_err.c#1 add .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/cpuvar.h#2 edit .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/cpuvar_defs.h#1 add .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/cyclic_impl.h#1 add .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/feature_tests.h#1 add .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/sema.h#1 add .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap_impl.h#1 add .. //depot/projects/dtrace/src/sys/modules/cyclic_test/Makefile#3 edit .. //depot/projects/dtrace/src/sys/modules/dtrace/dtmalloc/Makefile#2 edit .. //depot/projects/dtrace/src/sys/modules/dtrace/dtrace/Makefile#16 edit .. //depot/projects/dtrace/src/sys/modules/dtrace/fasttrap/Makefile#4 edit .. //depot/projects/dtrace/src/sys/modules/dtrace/fbt/Makefile#4 edit .. //depot/projects/dtrace/src/sys/modules/dtrace/lockstat/Makefile#2 edit .. //depot/projects/dtrace/src/sys/modules/dtrace/profile/Makefile#6 edit .. //depot/projects/dtrace/src/sys/modules/dtrace/prototype/Makefile#4 edit .. //depot/projects/dtrace/src/sys/modules/dtrace/sdt/Makefile#5 edit .. //depot/projects/dtrace/src/sys/modules/dtrace/systrace/Makefile#4 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/cpuvar.h#2 (text+ko) ==== @@ -28,8 +28,30 @@ #define _COMPAT_OPENSOLARIS_SYS_CPUVAR_H #include +#include #ifdef _KERNEL + +struct cyc_cpu; + +typedef struct { + int cpuid; + struct cyc_cpu *cpu_cyclic; + uint32_t cpu_flags; + uint_t cpu_intr_actv; + uintptr_t cpu_profile_pc; + uintptr_t cpu_profile_upc; + uintptr_t cpu_dtrace_caller; /* DTrace: caller, if any */ + hrtime_t cpu_dtrace_chillmark; /* DTrace: chill mark time */ + hrtime_t cpu_dtrace_chilled; /* DTrace: total chill time */ +} solaris_cpu_t; + +/* Some code may choose to redefine this if pcpu_t would be more useful. */ +#define cpu_t solaris_cpu_t +#define cpu_id cpuid + +extern solaris_cpu_t solaris_cpu[]; + #define CPU_CACHE_COHERENCE_SIZE 64 /* @@ -51,33 +73,50 @@ } cpu_core_t; extern cpu_core_t cpu_core[]; + +extern kmutex_t cpu_lock; #endif /* _KERNEL */ /* - * DTrace flags. + * Flags in the CPU structure. + * + * These are protected by cpu_lock (except during creation). + * + * Offlined-CPUs have three stages of being offline: + * + * CPU_ENABLE indicates that the CPU is participating in I/O interrupts + * that can be directed at a number of different CPUs. If CPU_ENABLE + * is off, the CPU will not be given interrupts that can be sent elsewhere, + * but will still get interrupts from devices associated with that CPU only, + * and from other CPUs. + * + * CPU_OFFLINE indicates that the dispatcher should not allow any threads + * other than interrupt threads to run on that CPU. A CPU will not have + * CPU_OFFLINE set if there are any bound threads (besides interrupts). + * + * CPU_QUIESCED is set if p_offline was able to completely turn idle the + * CPU and it will not have to run interrupt threads. In this case it'll + * stay in the idle loop until CPU_QUIESCED is turned off. + * + * CPU_FROZEN is used only by CPR to mark CPUs that have been successfully + * suspended (in the suspend path), or have yet to be resumed (in the resume + * case). + * + * On some platforms CPUs can be individually powered off. + * The following flags are set for powered off CPUs: CPU_QUIESCED, + * CPU_OFFLINE, and CPU_POWEROFF. The following flags are cleared: + * CPU_RUNNING, CPU_READY, CPU_EXISTS, and CPU_ENABLE. */ -#define CPU_DTRACE_NOFAULT 0x0001 /* Don't fault */ -#define CPU_DTRACE_DROP 0x0002 /* Drop this ECB */ -#define CPU_DTRACE_BADADDR 0x0004 /* DTrace fault: bad address */ -#define CPU_DTRACE_BADALIGN 0x0008 /* DTrace fault: bad alignment */ -#define CPU_DTRACE_DIVZERO 0x0010 /* DTrace fault: divide by zero */ -#define CPU_DTRACE_ILLOP 0x0020 /* DTrace fault: illegal operation */ -#define CPU_DTRACE_NOSCRATCH 0x0040 /* DTrace fault: out of scratch */ -#define CPU_DTRACE_KPRIV 0x0080 /* DTrace fault: bad kernel access */ -#define CPU_DTRACE_UPRIV 0x0100 /* DTrace fault: bad user access */ -#define CPU_DTRACE_TUPOFLOW 0x0200 /* DTrace fault: tuple stack overflow */ -#if defined(__sparc) -#define CPU_DTRACE_FAKERESTORE 0x0400 /* pid provider hint to getreg */ -#endif -#define CPU_DTRACE_ENTRY 0x0800 /* pid provider hint to ustack() */ -#define CPU_DTRACE_BADSTACK 0x1000 /* DTrace fault: bad stack */ - -#define CPU_DTRACE_FAULT (CPU_DTRACE_BADADDR | CPU_DTRACE_BADALIGN | \ - CPU_DTRACE_DIVZERO | CPU_DTRACE_ILLOP | \ - CPU_DTRACE_NOSCRATCH | CPU_DTRACE_KPRIV | \ - CPU_DTRACE_UPRIV | CPU_DTRACE_TUPOFLOW | \ - CPU_DTRACE_BADSTACK) -#define CPU_DTRACE_ERROR (CPU_DTRACE_FAULT | CPU_DTRACE_DROP) +#define CPU_RUNNING 0x001 /* CPU running */ +#define CPU_READY 0x002 /* CPU ready for cross-calls */ +#define CPU_QUIESCED 0x004 /* CPU will stay in idle */ +#define CPU_EXISTS 0x008 /* CPU is configured */ +#define CPU_ENABLE 0x010 /* CPU enabled for interrupts */ +#define CPU_OFFLINE 0x020 /* CPU offline via p_online */ +#define CPU_POWEROFF 0x040 /* CPU is powered off */ +#define CPU_FROZEN 0x080 /* CPU is frozen via CPR suspend */ +#define CPU_SPARE 0x100 /* CPU offline available for use */ +#define CPU_FAULTED 0x200 /* CPU offline diagnosed faulty */ typedef enum { CPU_INIT, ==== //depot/projects/dtrace/src/sys/modules/cyclic_test/Makefile#3 (text+ko) ==== @@ -7,8 +7,8 @@ #SRCS+= bus_if.h device_if.h vnode_if.h -CFLAGS+= -I${.CURDIR}/../../compat/opensolaris \ - -I${.CURDIR}/../../contrib/opensolaris/uts/common \ +CFLAGS+= -I${.CURDIR}/../../cddl/compat/opensolaris \ + -I${.CURDIR}/../../cddl/contrib/opensolaris/uts/common \ -I${.CURDIR}/../.. IGNORE_PRAGMA= 1 ==== //depot/projects/dtrace/src/sys/modules/dtrace/dtmalloc/Makefile#2 (text+ko) ==== @@ -6,8 +6,8 @@ SRCS= dtmalloc.c SRCS+= vnode_if.h -CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris \ - -I${.CURDIR}/../../../contrib/opensolaris/uts/common \ +CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris \ + -I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common \ -I${.CURDIR}/../../.. .include ==== //depot/projects/dtrace/src/sys/modules/dtrace/dtrace/Makefile#16 (text+ko) ==== @@ -2,7 +2,7 @@ ARCHDIR= ${MACHINE_ARCH} -.PATH: ${.CURDIR}/../../../contrib/opensolaris/uts/common/dtrace +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common/dtrace .PATH: ${.CURDIR}/../../../cddl/kern .PATH: ${.CURDIR}/../../../cddl/dev/dtrace .PATH: ${.CURDIR}/../../../cddl/dev/dtrace/${ARCHDIR} @@ -29,10 +29,10 @@ SRCS+= opt_apic.h .endif -CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris \ +CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris \ -I${.CURDIR}/../../../cddl/dev/dtrace \ -I${.CURDIR}/../../../cddl/dev/dtrace/${ARCHDIR} \ - -I${.CURDIR}/../../../contrib/opensolaris/uts/common \ + -I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common \ -I${.CURDIR}/../../.. -DDIS_MEM CFLAGS+= -DSMP -DDEBUG ==== //depot/projects/dtrace/src/sys/modules/dtrace/fasttrap/Makefile#4 (text+ko) ==== @@ -6,12 +6,12 @@ SRCS= fasttrap.c SRCS+= vnode_if.h -CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris \ - -I${.CURDIR}/../../../contrib/opensolaris/uts/common \ +CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris \ + -I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common \ -I${.CURDIR}/../../.. .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" -CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/uts/intel +CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/intel .endif CFLAGS+= -DSMP -DDEBUG ==== //depot/projects/dtrace/src/sys/modules/dtrace/fbt/Makefile#4 (text+ko) ==== @@ -6,8 +6,8 @@ SRCS= fbt.c SRCS+= vnode_if.h -CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris \ - -I${.CURDIR}/../../../contrib/opensolaris/uts/common \ +CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris \ + -I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common \ -I${.CURDIR}/../../.. .include ==== //depot/projects/dtrace/src/sys/modules/dtrace/lockstat/Makefile#2 (text+ko) ==== @@ -5,8 +5,8 @@ KMOD= lockstat SRCS= lockstat.c -CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris \ - -I${.CURDIR}/../../../contrib/opensolaris/uts/common \ +CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris \ + -I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common \ -I${.CURDIR}/../../.. .include ==== //depot/projects/dtrace/src/sys/modules/dtrace/profile/Makefile#6 (text+ko) ==== @@ -6,8 +6,8 @@ SRCS= profile.c SRCS+= vnode_if.h -CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris \ - -I${.CURDIR}/../../../contrib/opensolaris/uts/common \ +CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris \ + -I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common \ -I${.CURDIR}/../../.. .include ==== //depot/projects/dtrace/src/sys/modules/dtrace/prototype/Makefile#4 (text+ko) ==== @@ -6,8 +6,8 @@ SRCS= prototype.c SRCS+= vnode_if.h -CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris \ - -I${.CURDIR}/../../../contrib/opensolaris/uts/common \ +CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris \ + -I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common \ -I${.CURDIR}/../../.. .include ==== //depot/projects/dtrace/src/sys/modules/dtrace/sdt/Makefile#5 (text+ko) ==== @@ -6,8 +6,8 @@ SRCS= sdt.c SRCS+= vnode_if.h -CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris \ - -I${.CURDIR}/../../../contrib/opensolaris/uts/common \ +CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris \ + -I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common \ -I${.CURDIR}/../../.. .include ==== //depot/projects/dtrace/src/sys/modules/dtrace/systrace/Makefile#4 (text+ko) ==== @@ -6,8 +6,8 @@ SRCS= systrace.c SRCS+= vnode_if.h -CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris \ - -I${.CURDIR}/../../../contrib/opensolaris/uts/common \ +CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris \ + -I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common \ -I${.CURDIR}/../../.. .include From owner-p4-projects@FreeBSD.ORG Sun Mar 30 00:42:31 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 484421065675; Sun, 30 Mar 2008 00:42:31 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0721C106566C for ; Sun, 30 Mar 2008 00:42:31 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D4E998FC18 for ; Sun, 30 Mar 2008 00:42:30 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2U0gU7v001563 for ; Sun, 30 Mar 2008 00:42:30 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2U0gUKi001561 for perforce@freebsd.org; Sun, 30 Mar 2008 00:42:30 GMT (envelope-from jb@freebsd.org) Date: Sun, 30 Mar 2008 00:42:30 GMT Message-Id: <200803300042.m2U0gUKi001561@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 138953 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Mar 2008 00:42:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=138953 Change 138953 by jb@jb_freebsd1 on 2008/03/30 00:42:28 constify an arg for now. A later IFC will replace this, I think. Affected files ... .. //depot/projects/dtrace/src/sys/kern/kern_lock.c#22 edit Differences ... ==== //depot/projects/dtrace/src/sys/kern/kern_lock.c#22 (text+ko) ==== @@ -207,7 +207,7 @@ */ int _lockmgr_args(struct lock *lkp, u_int flags, struct mtx *interlkp, - const char *wmesg, int prio, int timo, char *file, int line) + const char *wmesg, int prio, int timo, const char *file, int line) { struct thread *td; From owner-p4-projects@FreeBSD.ORG Sun Mar 30 01:24:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1E5B4106567A; Sun, 30 Mar 2008 01:24:24 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D11121065682 for ; Sun, 30 Mar 2008 01:24:23 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C4AB98FC1B for ; Sun, 30 Mar 2008 01:24:23 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2U1ONA5013179 for ; Sun, 30 Mar 2008 01:24:23 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2U1ON8t013177 for perforce@freebsd.org; Sun, 30 Mar 2008 01:24:23 GMT (envelope-from sam@freebsd.org) Date: Sun, 30 Mar 2008 01:24:23 GMT Message-Id: <200803300124.m2U1ON8t013177@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 138955 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Mar 2008 01:24:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=138955 Change 138955 by sam@sam_ebb on 2008/03/30 01:23:23 hack a raw 802.11 tap in the tx path by hooking ieee80211_encap; doesn't handle frags and doesn't belong here--we need to pull the tx aggregation up to the net80211 layer so we can do encap and crypto before handing to the driver Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_output.c#43 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_output.c#43 (text+ko) ==== @@ -1103,6 +1103,10 @@ IEEE80211_NODE_STAT(ni, tx_ucast); IEEE80211_NODE_STAT_ADD(ni, tx_bytes, datalen); + /* XXX fragmented frames not handled */ + if (bpf_peers_present(vap->iv_rawbpf)) + bpf_mtap(vap->iv_rawbpf, m); + return m; bad: if (m != NULL) From owner-p4-projects@FreeBSD.ORG Sun Mar 30 02:40:43 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2A4A61065671; Sun, 30 Mar 2008 02:40:43 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DC022106566C for ; Sun, 30 Mar 2008 02:40:42 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C459D8FC26 for ; Sun, 30 Mar 2008 02:40:42 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2U2egvg016954 for ; Sun, 30 Mar 2008 02:40:42 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2U2egoV016952 for perforce@freebsd.org; Sun, 30 Mar 2008 02:40:42 GMT (envelope-from sam@freebsd.org) Date: Sun, 30 Mar 2008 02:40:42 GMT Message-Id: <200803300240.m2U2egoV016952@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 138957 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Mar 2008 02:40:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=138957 Change 138957 by sam@sam_ebb on 2008/03/30 02:39:42 o the WPA ie rid requires a 16-bit length at the front; add a routine to do this (could optimize out copy probably but it's hardly worth it) o we're doing all crypto on the host, so fixup the rx path to match (makes dhclient get a lease over wpa) o add some noinline to routines to simplify debugging o nuke packet dumping stuff; use tcpdump to get the same info Affected files ... .. //depot/projects/vap/sys/dev/wi/if_wi.c#19 edit Differences ... ==== //depot/projects/vap/sys/dev/wi/if_wi.c#19 (text+ko) ==== @@ -153,8 +153,7 @@ static int wi_mwrite_bap(struct wi_softc *, int, int, struct mbuf *, int); static int wi_read_rid(struct wi_softc *, int, void *, int *); static int wi_write_rid(struct wi_softc *, int, void *, int); - -static void wi_dump_pkt(struct wi_frame *, struct ieee80211_node *, int rssi); +static int wi_write_appie(struct wi_softc *, int, const struct ieee80211_appie *); static void wi_scan_start(struct ieee80211com *); static void wi_scan_end(struct ieee80211com *); @@ -183,11 +182,8 @@ 0, "control debugging printfs"); #define DPRINTF(X) if (wi_debug) printf X -#define IFF_DUMPPKTS(_ifp) \ - (((_ifp)->if_flags & (IFF_DEBUG|IFF_LINK2)) == (IFF_DEBUG|IFF_LINK2)) #else #define DPRINTF(X) -#define IFF_DUMPPKTS(_ifp) 0 #endif #define WI_INTRS (WI_EV_RX | WI_EV_ALLOC | WI_EV_INFO) @@ -852,12 +848,9 @@ if ((sc->sc_flags & WI_FLAGS_HAS_WPASUPPORT) && (vap->iv_flags & IEEE80211_F_WPA)) { wi_write_val(sc, WI_RID_WPA_HANDLING, 1); - if (vap->iv_appie_wpa != NULL) { -printf("%s: wpa ie %p %d\n", __func__, vap->iv_appie_wpa->ie_data, vap->iv_appie_wpa->ie_len); - wi_write_rid(sc, WI_RID_WPA_DATA, - vap->iv_appie_wpa->ie_data, - vap->iv_appie_wpa->ie_len); - } + if (vap->iv_appie_wpa != NULL) + wi_write_appie(sc, WI_RID_WPA_DATA, + vap->iv_appie_wpa); } wi_enable(sc); /* enable port */ @@ -929,6 +922,11 @@ wi_write_val(sc, WI_RID_ENH_SECURITY, 0x3); } + if ((sc->sc_flags & WI_FLAGS_HAS_WPASUPPORT) && + (vap->iv_flags & IEEE80211_F_WPA) && + vap->iv_appie_wpa != NULL) + wi_write_appie(sc, WI_RID_WPA_DATA, vap->iv_appie_wpa); + wi_write_val(sc, WI_RID_PROMISC, 0); /* Configure WEP. */ @@ -1006,8 +1004,6 @@ (caddr_t)&frmhdr.wi_whdr); m_adj(m0, sizeof(struct ieee80211_frame)); frmhdr.wi_dat_len = htole16(m0->m_pkthdr.len); - if (IFF_DUMPPKTS(ifp)) - wi_dump_pkt(&frmhdr, NULL, -1); ieee80211_free_node(ni); if (wi_start_tx(ifp, &frmhdr, m0)) continue; @@ -1115,8 +1111,6 @@ (caddr_t)&frmhdr.wi_whdr); m_adj(m0, sizeof(struct ieee80211_frame)); frmhdr.wi_dat_len = htole16(m0->m_pkthdr.len); - if (IFF_DUMPPKTS(ifp)) - wi_dump_pkt(&frmhdr, NULL, -1); if (wi_start_tx(ifp, &frmhdr, m0) < 0) { m0 = NULL; rc = EIO; @@ -1294,7 +1288,7 @@ #endif } -static void +static __noinline void wi_rx_intr(struct wi_softc *sc) { struct ieee80211com *ic = &sc->sc_ic; @@ -1318,9 +1312,6 @@ return; } - if (IFF_DUMPPKTS(ifp)) - wi_dump_pkt(&frmhdr, NULL, frmhdr.wi_rx_signal); - /* * Drop undecryptable or packets with receive errors here */ @@ -1379,16 +1370,6 @@ CSR_WRITE_2(sc, WI_EVENT_ACK, WI_EV_RX); - wh = mtod(m, struct ieee80211_frame *); - if (wh->i_fc[1] & IEEE80211_FC1_WEP) { - /* - * WEP is decrypted by hardware and the IV - * is stripped. Clear WEP bit but mark mbuf. - */ - wh->i_fc[1] &= ~IEEE80211_FC1_WEP; - m->m_flags |= M_WEP; - } - #if NBPFILTER > 0 if (bpf_peers_present(ifp->if_bpf)) { /* XXX replace divide by table */ @@ -1404,6 +1385,7 @@ } #endif /* synchronize driver's BSSID with firmware's BSSID */ + wh = mtod(m, struct ieee80211_frame *); dir = wh->i_fc[1] & IEEE80211_FC1_DIR_MASK; if (ic->ic_opmode == IEEE80211_M_IBSS && dir == IEEE80211_FC1_DIR_NODS) wi_sync_bssid(sc, wh->i_addr3); @@ -1420,7 +1402,7 @@ WI_LOCK(sc); } -static void +static __noinline void wi_tx_ex_intr(struct wi_softc *sc) { struct ifnet *ifp = sc->sc_ifp; @@ -1464,7 +1446,7 @@ CSR_WRITE_2(sc, WI_EVENT_ACK, WI_EV_TX_EXC); } -static void +static __noinline void wi_tx_intr(struct wi_softc *sc) { struct ifnet *ifp = sc->sc_ifp; @@ -1498,7 +1480,7 @@ } } -static void +static __noinline void wi_info_intr(struct wi_softc *sc) { struct ieee80211com *ic = &sc->sc_ic; @@ -2119,24 +2101,18 @@ return wi_cmd(sc, WI_CMD_ACCESS | WI_ACCESS_WRITE, rid, 0, 0); } -static void -wi_dump_pkt(struct wi_frame *wh, struct ieee80211_node *ni, int rssi) +static int +wi_write_appie(struct wi_softc *sc, int rid, const struct ieee80211_appie *ie) { - if (ni != NULL) - ieee80211_dump_pkt(ni->ni_ic, - (u_int8_t *) &wh->wi_whdr, sizeof(wh->wi_whdr), - ni->ni_txrate, rssi); - printf(" status 0x%x rx_tstamp1 %u rx_tstamp0 0x%u rx_silence %u\n", - le16toh(wh->wi_status), le16toh(wh->wi_rx_tstamp1), - le16toh(wh->wi_rx_tstamp0), wh->wi_rx_silence); - printf(" rx_signal %u rx_rate %u rx_flow %u\n", - wh->wi_rx_signal, wh->wi_rx_rate, wh->wi_rx_flow); - printf(" tx_rtry %u tx_rate %u tx_ctl 0x%x dat_len %u\n", - wh->wi_tx_rtry, wh->wi_tx_rate, - le16toh(wh->wi_tx_ctl), le16toh(wh->wi_dat_len)); - printf(" ehdr dst %6D src %6D type 0x%x\n", - wh->wi_ehdr.ether_dhost, ":", wh->wi_ehdr.ether_shost, ":", - wh->wi_ehdr.ether_type); + /* NB: 42 bytes is probably ok to have on the stack */ + char buf[sizeof(uint16_t) + 40]; + + if (ie->ie_len > 40) + return EINVAL; + /* NB: firmware requires 16-bit ie length before ie data */ + *(uint16_t *) buf = htole16(ie->ie_len); + memcpy(buf + sizeof(uint16_t), ie->ie_data, ie->ie_len); + return wi_write_rid(sc, rid, buf, ie->ie_len + sizeof(uint16_t)); } int From owner-p4-projects@FreeBSD.ORG Sun Mar 30 02:51:56 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 09D1F1065672; Sun, 30 Mar 2008 02:51:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A24B6106566C for ; Sun, 30 Mar 2008 02:51:55 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 94A798FC18 for ; Sun, 30 Mar 2008 02:51:55 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2U2ptri017321 for ; Sun, 30 Mar 2008 02:51:55 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2U2ptr3017319 for perforce@freebsd.org; Sun, 30 Mar 2008 02:51:55 GMT (envelope-from jb@freebsd.org) Date: Sun, 30 Mar 2008 02:51:55 GMT Message-Id: <200803300251.m2U2ptr3017319@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 138958 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Mar 2008 02:51:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=138958 Change 138958 by jb@jb_freebsd1 on 2008/03/30 02:51:23 IFC Affected files ... .. //depot/projects/dtrace/ports/UPDATING#63 integrate .. //depot/projects/dtrace/src/sys/fs/nullfs/null_subr.c#7 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_mqueue.c#13 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_vnops.c#16 integrate .. //depot/projects/dtrace/src/sys/netgraph/ng_base.c#18 integrate .. //depot/projects/dtrace/www/en/gnome/docs/bugging.sgml#8 integrate .. //depot/projects/dtrace/www/en/gnome/docs/develfaq.sgml#10 integrate .. //depot/projects/dtrace/www/en/gnome/docs/faq2.sgml#19 integrate .. //depot/projects/dtrace/www/en/gnome/docs/volunteer.sgml#6 integrate Differences ... ==== //depot/projects/dtrace/ports/UPDATING#63 (text+ko) ==== @@ -6,11 +6,18 @@ time you update your ports collection, before attempting any port upgrades. +20080330: + AFFECTS: users of www/mediawiki + AUTHOR: miwi@FreeBSD.org + + www/mediawiki version is 1.12 now. 1.11 version was preserved on + www/mediawiki111 port. + 20080329: AFFECTS: users of www/phpadsnew AUTHOR: beech@FreeBSD.org - Phpadsnew has been replaced with www/openx. + Phpadsnew has been replaced with www/openx. To upgrade please do the following: 1. Install www/openx @@ -6267,4 +6274,4 @@ 2) Update all p5-* modules. portupgrade -f p5-\* -$FreeBSD: ports/UPDATING,v 1.608 2008/03/29 19:50:39 beech Exp $ +$FreeBSD: ports/UPDATING,v 1.610 2008/03/30 00:20:48 miwi Exp $ ==== //depot/projects/dtrace/src/sys/fs/nullfs/null_subr.c#7 (text+ko) ==== @@ -31,7 +31,7 @@ * * @(#)null_subr.c 8.7 (Berkeley) 5/14/95 * - * $FreeBSD: src/sys/fs/nullfs/null_subr.c,v 1.53 2008/01/10 01:10:47 attilio Exp $ + * $FreeBSD: src/sys/fs/nullfs/null_subr.c,v 1.54 2008/03/29 23:24:54 jeff Exp $ */ #include @@ -103,11 +103,9 @@ struct mount *mp; struct vnode *lowervp; { - struct thread *td = curthread; /* XXX */ struct null_node_hashhead *hd; struct null_node *a; struct vnode *vp; - int error; ASSERT_VOP_LOCKED(lowervp, "null_hashget"); @@ -121,24 +119,15 @@ mtx_lock(&null_hashmtx); LIST_FOREACH(a, hd, null_hash) { if (a->null_lowervp == lowervp && NULLTOV(a)->v_mount == mp) { - vp = NULLTOV(a); - VI_LOCK(vp); - mtx_unlock(&null_hashmtx); - /* - * We need to clear the OWEINACT flag here as this - * may lead vget() to try to lock our vnode which - * is already locked via lowervp. - */ - vp->v_iflag &= ~VI_OWEINACT; - error = vget(vp, LK_INTERLOCK, td); /* * Since we have the lower node locked the nullfs * node can not be in the process of recycling. If * it had been recycled before we grabed the lower * lock it would not have been found on the hash. */ - if (error) - panic("null_hashget: vget error %d", error); + vp = NULLTOV(a); + vref(vp); + mtx_unlock(&null_hashmtx); return (vp); } } @@ -155,11 +144,9 @@ struct mount *mp; struct null_node *xp; { - struct thread *td = curthread; /* XXX */ struct null_node_hashhead *hd; struct null_node *oxp; struct vnode *ovp; - int error; hd = NULL_NHASH(xp->null_lowervp); mtx_lock(&null_hashmtx); @@ -171,12 +158,8 @@ * operation. */ ovp = NULLTOV(oxp); - VI_LOCK(ovp); + vref(ovp); mtx_unlock(&null_hashmtx); - ovp->v_iflag &= ~VI_OWEINACT; - error = vget(ovp, LK_INTERLOCK, td); - if (error) - panic("null_hashins: vget error %d", error); return (ovp); } } ==== //depot/projects/dtrace/src/sys/kern/uipc_mqueue.c#13 (text+ko) ==== @@ -43,7 +43,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_mqueue.c,v 1.29 2008/01/13 14:44:09 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_mqueue.c,v 1.30 2008/03/29 23:30:40 jeff Exp $"); #include #include @@ -704,12 +704,9 @@ } if (vd != NULL) { - if (vget(vd->mv_vnode, 0, curthread) == 0) { - *vpp = vd->mv_vnode; - vn_lock(*vpp, LK_RETRY | LK_EXCLUSIVE); - return (0); - } - /* XXX if this can happen, we're in trouble */ + *vpp = vd->mv_vnode; + vget(*vpp, LK_RETRY | LK_EXCLUSIVE, curthread); + return (0); } error = getnewvnode("mqueue", mp, &mqfs_vnodeops, vpp); ==== //depot/projects/dtrace/src/sys/kern/vfs_vnops.c#16 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_vnops.c,v 1.259 2008/03/24 04:17:35 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_vnops.c,v 1.260 2008/03/29 23:36:26 jeff Exp $"); #include "opt_mac.h" @@ -854,26 +854,16 @@ } /* - * Check that the vnode is still valid, and if so - * acquire requested lock. + * Acquire the requested lock and then check for validity. LK_RETRY + * permits vn_lock to return doomed vnodes. */ int _vn_lock(struct vnode *vp, int flags, char *file, int line) { int error; - /* - * With no lock type requested we're just polling for validity. - */ - if ((flags & LK_TYPE_MASK) == 0) { - error = 0; - if ((flags & LK_INTERLOCK) == 0) - VI_LOCK(vp); - if (vp->v_iflag & VI_DOOMED) - error = ENOENT; - VI_UNLOCK(vp); - return (error); - } + VNASSERT((flags & LK_TYPE_MASK) != 0, vp, + ("vn_lock called with no locktype.")); do { error = VOP_LOCK1(vp, flags, file, line); flags &= ~LK_INTERLOCK; /* Interlock is always dropped. */ ==== //depot/projects/dtrace/src/sys/netgraph/ng_base.c#18 (text+ko) ==== @@ -38,7 +38,7 @@ * Authors: Julian Elischer * Archie Cobbs * - * $FreeBSD: src/sys/netgraph/ng_base.c,v 1.152 2008/03/27 23:02:30 mav Exp $ + * $FreeBSD: src/sys/netgraph/ng_base.c,v 1.154 2008/03/30 00:27:48 mav Exp $ * $Whistle: ng_base.c,v 1.39 1999/01/28 23:54:53 julian Exp $ */ @@ -770,11 +770,9 @@ return (0); } - do { - v = node->nd_refs - 1; - } while (! atomic_cmpset_int(&node->nd_refs, v + 1, v)); + v = atomic_fetchadd_int(&node->nd_refs, -1); - if (v == 0) { /* we were the last */ + if (v == 1) { /* we were the last */ mtx_lock(&ng_namehash_mtx); node->nd_type->refs--; /* XXX maybe should get types lock? */ @@ -788,7 +786,7 @@ mtx_destroy(&node->nd_input_queue.q_mtx); NG_FREE_NODE(node); } - return (v); + return (v - 1); } /************************************************************************ @@ -959,15 +957,12 @@ if (hook == &ng_deadhook) { return; } - do { - v = hook->hk_refs; - } while (! atomic_cmpset_int(&hook->hk_refs, v, v - 1)); + + v = atomic_fetchadd_int(&hook->hk_refs, -1); if (v == 1) { /* we were the last */ - if (_NG_HOOK_NODE(hook)) { /* it'll probably be ng_deadnode */ + if (_NG_HOOK_NODE(hook)) /* it'll probably be ng_deadnode */ _NG_NODE_UNREF((_NG_HOOK_NODE(hook))); - hook->hk_node = NULL; - } NG_FREE_HOOK(hook); } } ==== //depot/projects/dtrace/www/en/gnome/docs/bugging.sgml#8 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -117,7 +117,7 @@ FreeBSD-specific, and you have a fix available, report it to both the FreeBSD GNOME team and the application's developers. This way, the application's developers can apply - the patch to CVS, and the FreeBSD GNOME team can apply the + the patch upstream, and the FreeBSD GNOME team can apply the patch immediately to the ports tree without needing to wait for the next release.

==== //depot/projects/dtrace/www/en/gnome/docs/develfaq.sgml#10 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -44,7 +44,7 @@ versions are committed to the FreeBSD CVS tree. This document is about the development branch. The current development branch is GNOME &gnomedevelver;. -
  • CVS - Often newer-than-new, the CVS HEAD versions of GNOME +
  • SVN - Often newer-than-new, the SVN trunk versions of GNOME applications and libraries are alpha quality, or often completely unbuildable. The FreeBSD GNOME project pays attention to, but does not track the alpha quality code.
    • @@ -110,20 +110,7 @@ into your main ports tree. From there, you can use portupgrade or portmaster to upgrade from &gnomever; to &gnomedevelver; and stay up-to-date afterwards. - NOTE: if this is a first-time upgrade from &gnomever; to - &gnomedevelver; you must run portupgrade or - portmaster command:

    - 
    -portupgrade -o textproc/rarian textproc/scrollkeeper
-portupgrade -a
-
-or
-
-portmaster -o textproc/rarian textproc/scrollkeeper
-portmaster -a
-
    -

    The long answer is that keeping up-to-date with the GNOME development branch is complicated. Sometimes components change in a way that makes portupgrade or portmaster @@ -171,7 +158,7 @@

  • What is the current state of development GNOME on FreeBSD?

    -

    GNOME 2.20.0 is now out, and ports and packages are +

    GNOME 2.22.0 is now out, and ports and packages are up-to-date. Keep those bug reports coming.

    • ==== //depot/projects/dtrace/www/en/gnome/docs/faq2.sgml#19 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -41,7 +41,7 @@ fonts?
  • How can I control what fonts are anti-aliased? -
  • How do I edit my GNOME 2 menus? +
  • How do I edit my GNOME menus?
  • How do I use GTK+ 2 resource settings for GTK+ 2 applications when not in a GNOME environment?
  • How do I configure settings for GNOME 1.4 @@ -308,32 +308,32 @@

    I installed GNOME &gnomever;, but I am missing application foo. What gives?

    -

    Only the core desktop is included in the +

    Only the core Desktop is included in the gnome2 package. Here are some other GNOME - meta-ports that offer convenient groupings of popular GNOME 2 + meta-ports that offer convenient groupings of popular GNOME software.

    Send any feedback to From owner-p4-projects@FreeBSD.ORG Sun Mar 30 04:31:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 30B5C1065676; Sun, 30 Mar 2008 04:31:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DA829106566B for ; Sun, 30 Mar 2008 04:31:47 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CE60E8FC19 for ; Sun, 30 Mar 2008 04:31:47 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2U4VlLn022694 for ; Sun, 30 Mar 2008 04:31:47 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2U4Vlp1022692 for perforce@freebsd.org; Sun, 30 Mar 2008 04:31:47 GMT (envelope-from sam@freebsd.org) Date: Sun, 30 Mar 2008 04:31:47 GMT Message-Id: <200803300431.m2U4Vlp1022692@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 138962 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Mar 2008 04:31:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=138962 Change 138962 by sam@sam_ebb on 2008/03/30 04:31:16 o remove NBPFILTER compat stuff o don't waste effort supporting h/w WEP; at 11b rates and even really old cpu's it's hardly worth not doing it in the host o use m_getcl and m_gethdr o use conversion tables instead of open code in mapping a tx rate to a firmware code o misc style cleanups Affected files ... .. //depot/projects/vap/sys/dev/wi/if_wi.c#20 edit .. //depot/projects/vap/sys/dev/wi/if_wivar.h#14 edit Differences ... ==== //depot/projects/vap/sys/dev/wi/if_wi.c#20 (text+ko) ==== @@ -64,8 +64,6 @@ #define WI_HERMES_STATS_WAR /* Work around stats counter bug. */ -#define NBPFILTER 1 - #include #include #include @@ -135,9 +133,6 @@ static void wi_tx_ex_intr(struct wi_softc *); static void wi_info_intr(struct wi_softc *); -static int wi_key_alloc(struct ieee80211vap *, const struct ieee80211_key *, - ieee80211_keyix *, ieee80211_keyix *); - static int wi_write_txrate(struct wi_softc *, struct ieee80211vap *); static int wi_write_wep(struct wi_softc *, struct ieee80211vap *); static int wi_write_multi(struct wi_softc *); @@ -180,7 +175,6 @@ static int wi_debug = 0; SYSCTL_INT(_hw_wi, OID_AUTO, debug, CTLFLAG_RW, &wi_debug, 0, "control debugging printfs"); - #define DPRINTF(X) if (wi_debug) printf X #else #define DPRINTF(X) @@ -332,7 +326,6 @@ ic->ic_opmode = IEEE80211_M_STA; ic->ic_caps = IEEE80211_C_PMGT | IEEE80211_C_MONITOR - | IEEE80211_C_WEP /* everyone supports WEP */ ; /* @@ -449,7 +442,6 @@ ic->ic_vap_delete = wi_vap_delete; ic->ic_update_mcast = wi_update_mcast; -#if NBPFILTER > 0 bpfattach(ifp, DLT_IEEE802_11_RADIO, sizeof(struct ieee80211_frame) + sizeof(sc->sc_tx_th)); /* @@ -468,7 +460,6 @@ sc->sc_rx_th_len = roundup(sizeof(sc->sc_rx_th), sizeof(u_int32_t)); sc->sc_rx_th.wr_ihdr.it_len = htole16(sc->sc_rx_th_len); sc->sc_rx_th.wr_ihdr.it_present = htole32(WI_RX_RADIOTAP_PRESENT); -#endif if (bootverbose) ieee80211_announce(ic); @@ -489,9 +480,7 @@ wi_stop_locked(sc, 0); WI_UNLOCK(sc); -#if NBPFILTER > 0 bpfdetach(ifp); -#endif ieee80211_ifdetach(&sc->sc_ic); bus_teardown_intr(dev, sc->irq, sc->wi_intrhand); @@ -520,8 +509,6 @@ vap = &wvp->wv_vap; ieee80211_vap_setup(ic, vap, name, unit, opmode, flags, bssid, mac); - wvp->wv_key_alloc = vap->iv_key_alloc; - vap->iv_key_alloc = wi_key_alloc; vap->iv_max_aid = WI_MAX_AID; switch (opmode) { @@ -742,12 +729,11 @@ WI_LOCK(sc); wi_write_val(sc, WI_RID_OWN_CHNL, ieee80211_chan2ieee(ic, ic->ic_curchan)); -#if NBPFILTER > 0 + sc->sc_tx_th.wt_chan_freq = sc->sc_rx_th.wr_chan_freq = htole16(ic->ic_curchan->ic_freq); sc->sc_tx_th.wt_chan_flags = sc->sc_rx_th.wr_chan_flags = htole16(ic->ic_curchan->ic_flags); -#endif WI_UNLOCK(sc); } @@ -948,6 +934,7 @@ struct ieee80211_node *ni; struct ieee80211_frame *wh; struct mbuf *m0; + struct ieee80211_key *k; struct wi_frame frmhdr; int cur; @@ -978,13 +965,10 @@ ieee80211_free_node(ni); continue; } + wh = mtod(m0, struct ieee80211_frame *); frmhdr.wi_tx_ctl = htole16(WI_ENC_TX_802_11|WI_TXCNTL_TX_EX); - /* XXX check key for SWCRYPT instead of using operating mode */ - if ((wh->i_fc[1] & IEEE80211_FC1_WEP) && - (sc->sc_encryption & HOST_ENCRYPT)) { - struct ieee80211_key *k; - + if (wh->i_fc[1] & IEEE80211_FC1_WEP) { k = ieee80211_crypto_encap(ni, m0); if (k == NULL) { ieee80211_free_node(ni); @@ -993,13 +977,13 @@ } frmhdr.wi_tx_ctl |= htole16(WI_TXCNTL_NOCRYPT); } -#if NBPFILTER > 0 + if (bpf_peers_present(ifp->if_bpf)) { sc->sc_tx_th.wt_rate = ni->ni_txrate; bpf_mtap2(ifp->if_bpf, &sc->sc_tx_th, sc->sc_tx_th_len, m0); } -#endif + m_copydata(m0, 0, sizeof(struct ieee80211_frame), (caddr_t)&frmhdr.wi_whdr); m_adj(m0, sizeof(struct ieee80211_frame)); @@ -1058,6 +1042,7 @@ struct ieee80211com *ic = ni->ni_ic; struct ifnet *ifp = ic->ic_ifp; struct wi_softc *sc = ifp->if_softc; + struct ieee80211_key *k; struct ieee80211_frame *wh; struct wi_frame frmhdr; int cur; @@ -1086,27 +1071,19 @@ frmhdr.wi_tx_ctl = htole16(WI_ENC_TX_802_11|WI_TXCNTL_TX_EX); if (params && (params->ibp_flags & IEEE80211_BPF_NOACK)) frmhdr.wi_tx_ctl |= htole16(WI_TXCNTL_ALTRTRY); - /* XXX check key for SWCRYPT instead of using operating mode */ if ((wh->i_fc[1] & IEEE80211_FC1_WEP) && - (sc->sc_encryption & HOST_ENCRYPT)) { - if (!params || - (params && (params->ibp_flags & IEEE80211_BPF_CRYPTO))) { - struct ieee80211_key *k; - - k = ieee80211_crypto_encap(ni, m0); - if (k == NULL) { - rc = ENOMEM; - goto out; - } - frmhdr.wi_tx_ctl |= htole16(WI_TXCNTL_NOCRYPT); + (!params || (params && (params->ibp_flags & IEEE80211_BPF_CRYPTO)))) { + k = ieee80211_crypto_encap(ni, m0); + if (k == NULL) { + rc = ENOMEM; + goto out; } + frmhdr.wi_tx_ctl |= htole16(WI_TXCNTL_NOCRYPT); } -#if NBPFILTER > 0 if (bpf_peers_present(ifp->if_bpf)) { sc->sc_tx_th.wt_rate = ni->ni_txrate; bpf_mtap2(ifp->if_bpf, &sc->sc_tx_th, sc->sc_tx_th_len, m0); } -#endif m_copydata(m0, 0, sizeof(struct ieee80211_frame), (caddr_t)&frmhdr.wi_whdr); m_adj(m0, sizeof(struct ieee80211_frame)); @@ -1343,24 +1320,16 @@ len = 0; } - MGETHDR(m, M_DONTWAIT, MT_DATA); + if (off + len > MHLEN) + m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); + else + m = m_gethdr(M_DONTWAIT, MT_DATA); if (m == NULL) { CSR_WRITE_2(sc, WI_EVENT_ACK, WI_EV_RX); ifp->if_ierrors++; DPRINTF(("wi_rx_intr: MGET failed\n")); return; } - if (off + len > MHLEN) { - MCLGET(m, M_DONTWAIT); - if ((m->m_flags & M_EXT) == 0) { - CSR_WRITE_2(sc, WI_EVENT_ACK, WI_EV_RX); - m_freem(m); - ifp->if_ierrors++; - DPRINTF(("wi_rx_intr: MCLGET failed\n")); - return; - } - } - m->m_data += off - sizeof(struct ieee80211_frame); memcpy(m->m_data, &frmhdr.wi_whdr, sizeof(struct ieee80211_frame)); wi_read_bap(sc, fid, sizeof(frmhdr), @@ -1370,7 +1339,6 @@ CSR_WRITE_2(sc, WI_EVENT_ACK, WI_EV_RX); -#if NBPFILTER > 0 if (bpf_peers_present(ifp->if_bpf)) { /* XXX replace divide by table */ sc->sc_rx_th.wr_rate = frmhdr.wi_rx_rate / 5; @@ -1383,7 +1351,7 @@ sc->sc_rx_th.wr_flags |= IEEE80211_RADIOTAP_F_WEP; bpf_mtap2(ifp->if_bpf, &sc->sc_rx_th, sc->sc_rx_th_len, m); } -#endif + /* synchronize driver's BSSID with firmware's BSSID */ wh = mtod(m, struct ieee80211_frame *); dir = wh->i_fc[1] & IEEE80211_FC1_DIR_MASK; @@ -1413,7 +1381,6 @@ /* Read in the frame header */ if (wi_read_bap(sc, fid, 0, &frmhdr, sizeof(frmhdr)) == 0) { u_int16_t status = le16toh(frmhdr.wi_status); - /* * Spontaneous station disconnects appear as xmit * errors. Don't announce them and/or count them @@ -1686,78 +1653,32 @@ static int wi_write_txrate(struct wi_softc *sc, struct ieee80211vap *vap) { + static const uint16_t lucent_rates[12] = { + [ 0] = 3, /* auto */ + [ 1] = 1, /* 1Mb/s */ + [ 2] = 2, /* 2Mb/s */ + [ 5] = 4, /* 5.5Mb/s */ + [11] = 5 /* 11Mb/s */ + }; + static const uint16_t intersil_rates[12] = { + [ 0] = 0xf, /* auto */ + [ 1] = 0, /* 1Mb/s */ + [ 2] = 1, /* 2Mb/s */ + [ 5] = 2, /* 5.5Mb/s */ + [11] = 3, /* 11Mb/s */ + }; + const uint16_t *rates = sc->sc_firmware_type == WI_LUCENT ? + lucent_rates : intersil_rates; + struct ieee80211com *ic = vap->iv_ic; const struct ieee80211_txparam *tp; - struct ieee80211com *ic = vap->iv_ic; - int i; - u_int16_t rate; tp = &vap->iv_txparms[ieee80211_chan2mode(ic->ic_bsschan)]; - if (tp->ucastrate == IEEE80211_FIXED_RATE_NONE) - rate = 0; /* auto */ - else - rate = tp->ucastrate / 2; - - /* rate: 0, 1, 2, 5, 11 */ - - switch (sc->sc_firmware_type) { - case WI_LUCENT: - switch (rate) { - case 0: /* auto == 11mbps auto */ - rate = 3; - break; - /* case 1, 2 map to 1, 2*/ - case 5: /* 5.5Mbps -> 4 */ - rate = 4; - break; - case 11: /* 11mbps -> 5 */ - rate = 5; - break; - default: - break; - } - break; - default: - /* Choose a bit according to this table. - * - * bit | data rate - * ----+------------------- - * 0 | 1Mbps - * 1 | 2Mbps - * 2 | 5.5Mbps - * 3 | 11Mbps - */ - for (i = 8; i > 0; i >>= 1) { - if (rate >= i) - break; - } - if (i == 0) - rate = 0xf; /* auto */ - else - rate = i; - break; - } - return wi_write_val(sc, WI_RID_TX_RATE, rate); + return wi_write_val(sc, WI_RID_TX_RATE, + (tp->ucastrate == IEEE80211_FIXED_RATE_NONE ? + rates[0] : rates[tp->ucastrate / 2])); } static int -wi_key_alloc(struct ieee80211vap *vap, const struct ieee80211_key *k, - ieee80211_keyix *keyix, ieee80211_keyix *rxkeyix) -{ - struct wi_softc *sc = vap->iv_ic->ic_ifp->if_softc; - - /* - * When doing host encryption of outbound frames fail requests - * for keys that are not marked w/ the SWCRYPT flag so the - * net80211 layer falls back to s/w crypto. Note that we also - * fixup existing keys below to handle mode changes. - */ - if ((sc->sc_encryption & HOST_ENCRYPT) && - (k->wk_flags & IEEE80211_KEY_SWCRYPT) == 0) - return 0; - return WI_VAP(vap)->wv_key_alloc(vap, k, keyix, rxkeyix); -} - -static int wi_write_wep(struct wi_softc *sc, struct ieee80211vap *vap) { int error = 0; @@ -1816,47 +1737,9 @@ sc->sc_encryption = val; if ((val & PRIVACY_INVOKED) == 0) break; - error = wi_write_val(sc, WI_RID_P2_TX_CRYPT_KEY, - vap->iv_def_txkey); - if (error) - break; - if (val & HOST_DECRYPT) - break; - /* - * It seems that the firmware accept 104bit key only if - * all the keys have 104bit length. We get the length of - * the transmit key and use it for all other keys. - * Perhaps we should use software WEP for such situation. - */ - if (vap->iv_def_txkey != IEEE80211_KEYIX_NONE) - keylen = vap->iv_nw_keys[vap->iv_def_txkey].wk_keylen; - else /* XXX should not hapen */ - keylen = IEEE80211_WEP_KEYLEN; - if (keylen > IEEE80211_WEP_KEYLEN) - keylen = 13; /* 104bit keys */ - else - keylen = IEEE80211_WEP_KEYLEN; - for (i = 0; i < IEEE80211_WEP_NKID; i++) { - error = wi_write_rid(sc, WI_RID_P2_CRYPT_KEY0 + i, - vap->iv_nw_keys[i].wk_key, keylen); - if (error) - break; - } + error = wi_write_val(sc, WI_RID_P2_TX_CRYPT_KEY, vap->iv_def_txkey); break; } - /* - * XXX horrible hack; insure pre-existing keys are - * setup properly to do s/w crypto. - */ - for (i = 0; i < IEEE80211_WEP_NKID; i++) { - struct ieee80211_key *k = &vap->iv_nw_keys[i]; - if (k->wk_flags & IEEE80211_KEY_XMIT) { - if (sc->sc_encryption & HOST_ENCRYPT) - k->wk_flags |= IEEE80211_KEY_SWCRYPT; - else - k->wk_flags &= ~IEEE80211_KEY_SWCRYPT; - } - } return error; } @@ -2125,9 +2008,9 @@ sc->iobase = bus_alloc_resource(dev, SYS_RES_IOPORT, &sc->iobase_rid, 0, ~0, (1 << 6), rman_make_alignment_flags(1 << 6) | RF_ACTIVE); - if (!sc->iobase) { + if (sc->iobase == NULL) { device_printf(dev, "No I/O space?!\n"); - return (ENXIO); + return ENXIO; } sc->wi_io_addr = rman_get_start(sc->iobase); @@ -2137,10 +2020,9 @@ sc->mem_rid = rid; sc->mem = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &sc->mem_rid, RF_ACTIVE); - - if (!sc->mem) { + if (sc->mem == NULL) { device_printf(dev, "No Mem space on prism2.5?\n"); - return (ENXIO); + return ENXIO; } sc->wi_btag = rman_get_bustag(sc->mem); @@ -2151,17 +2033,15 @@ sc->irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &sc->irq_rid, RF_ACTIVE | ((sc->wi_bus_type == WI_BUS_PCCARD) ? 0 : RF_SHAREABLE)); - - if (!sc->irq) { + if (sc->irq == NULL) { wi_free(dev); device_printf(dev, "No irq?!\n"); - return (ENXIO); + return ENXIO; } sc->sc_dev = dev; sc->sc_unit = device_get_unit(dev); - - return (0); + return 0; } void @@ -2181,6 +2061,4 @@ bus_release_resource(dev, SYS_RES_MEMORY, sc->mem_rid, sc->mem); sc->mem = NULL; } - - return; } ==== //depot/projects/vap/sys/dev/wi/if_wivar.h#14 (text+ko) ==== @@ -64,9 +64,6 @@ struct mbuf *, int, int, int, u_int32_t); int (*wv_newstate)(struct ieee80211vap *, enum ieee80211_state, int); - int (*wv_key_alloc)(struct ieee80211vap *, - const struct ieee80211_key *, - ieee80211_keyix *, ieee80211_keyix *); }; #define WI_VAP(vap) ((struct wi_vap *)(vap)) From owner-p4-projects@FreeBSD.ORG Sun Mar 30 04:48:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8F44C1065678; Sun, 30 Mar 2008 04:48:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4E2DE1065673 for ; Sun, 30 Mar 2008 04:48:06 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 421258FC28 for ; Sun, 30 Mar 2008 04:48:06 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2U4m59m032228 for ; Sun, 30 Mar 2008 04:48:05 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2U4m5BX032226 for perforce@freebsd.org; Sun, 30 Mar 2008 04:48:05 GMT (envelope-from thompsa@freebsd.org) Date: Sun, 30 Mar 2008 04:48:05 GMT Message-Id: <200803300448.m2U4m5BX032226@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 138963 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Mar 2008 04:48:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=138963 Change 138963 by thompsa@thompsa_burger on 2008/03/30 04:48:01 Checkpoint the mechanical vap changes. It compiles but is untested and still needs work. Affected files ... .. //depot/projects/vap/sys/dev/if_ndis/if_ndis.c#8 edit .. //depot/projects/vap/sys/dev/if_ndis/if_ndisvar.h#7 edit Differences ... ==== //depot/projects/vap/sys/dev/if_ndis/if_ndis.c#8 (text+ko) ==== @@ -133,6 +133,11 @@ static funcptr ndis_resettask_wrap; static funcptr ndis_inputtask_wrap; +static struct ieee80211vap *ndis_vap_create(struct ieee80211com *, + const char name[IFNAMSIZ], int unit, int opmode, + int flags, const uint8_t bssid[IEEE80211_ADDR_LEN], + const uint8_t mac[IEEE80211_ADDR_LEN]); +static void ndis_vap_delete (struct ieee80211vap *); static void ndis_tick (void *); static void ndis_ticktask (device_object *, void *); static void ndis_start (struct ifnet *); @@ -140,9 +145,7 @@ static void ndis_resettask (device_object *, void *); static void ndis_inputtask (device_object *, void *); static int ndis_ioctl (struct ifnet *, u_long, caddr_t); -static int ndis_80211_ioctl_get (struct ifnet *, u_long, caddr_t); -static int ndis_80211_ioctl_set (struct ifnet *, u_long, caddr_t); -static int ndis_newstate (struct ieee80211com *, enum ieee80211_state, +static int ndis_newstate (struct ieee80211vap *, enum ieee80211_state, int); static int ndis_nettype_chan (uint32_t); static int ndis_nettype_mode (uint32_t); @@ -151,8 +154,8 @@ static void ndis_scan_start (struct ieee80211com *); static void ndis_scan_end (struct ieee80211com *); static void ndis_set_channel (struct ieee80211com *); -static void ndis_scan_curchan (struct ieee80211com *, unsigned long); -static void ndis_scan_mindwell (struct ieee80211com *); +static void ndis_scan_curchan (struct ieee80211_scan_state *, unsigned long); +static void ndis_scan_mindwell (struct ieee80211_scan_state *); static void ndis_init (void *); static void ndis_stop (struct ndis_softc *); static void ndis_watchdog (struct ifnet *); @@ -164,12 +167,11 @@ static void ndis_getstate_80211 (struct ndis_softc *); static void ndis_setstate_80211 (struct ndis_softc *); static int ndis_set_cipher (struct ndis_softc *, int); -static int ndis_set_wpa (struct ndis_softc *); -static int ndis_add_key (struct ieee80211com *, +static int ndis_set_wpa (struct ndis_softc *, void *, int); +static int ndis_add_key (struct ieee80211vap *, const struct ieee80211_key *, const u_int8_t []); -static int ndis_del_key (struct ieee80211com *, +static int ndis_del_key (struct ieee80211vap *, const struct ieee80211_key *); -static void ndis_media_status (struct ifnet *, struct ifmediareq *); static void ndis_setmulti (struct ndis_softc *); static void ndis_map_sclist (void *, bus_dma_segment_t *, @@ -520,16 +522,11 @@ driver_object *pdrv; device_object *pdo; struct ifnet *ifp = NULL; - int error = 0, len, mode, bands = 0; + int error = 0, len, mode; + uint8_t bands = 0; int i; sc = device_get_softc(dev); - ifp = sc->ifp = if_alloc(IFT_ETHER); - if (ifp == NULL) { - error = ENOSPC; - goto fail; - } - ifp->if_softc = sc; KeInitializeSpinLock(&sc->ndis_spinlock); KeInitializeSpinLock(&sc->ndis_rxlock); @@ -598,10 +595,6 @@ sc->ndis_inputitem = IoAllocateWorkItem(sc->ndis_block->nmb_deviceobj); KeInitializeDpc(&sc->ndis_rxdpc, ndis_rxeof_xfr_wrap, sc->ndis_block); - /* make sure drv flags are all cleared before initing the NIC. */ - - ifp->if_drv_flags = 0; - /* Call driver's init routine. */ if (ndis_init_nic(sc)) { device_printf (dev, "init handler failed\n"); @@ -677,6 +670,17 @@ } } + if (sc->ndis_80211) + ifp = if_alloc(IFT_IEEE80211); + else + ifp = if_alloc(IFT_ETHER); + if (ifp == NULL) { + error = ENOSPC; + goto fail; + } + sc->ifp = ifp; + ifp->if_softc = sc; + /* Check for task offload support. */ ndis_probe_offload(sc); @@ -710,7 +714,6 @@ ic->ic_ifp = ifp; ic->ic_phytype = IEEE80211_T_DS; - ic->ic_opmode = IEEE80211_M_STA; ic->ic_caps = IEEE80211_C_IBSS; setbit(ic->ic_modecaps, IEEE80211_MODE_AUTO); len = 0; @@ -840,7 +843,7 @@ } #undef SETRATE #undef INCRATE - ieee80211_init_channels(ic, 0, CTRY_DEFAULT, bands, 0, 1); + ieee80211_init_channels(ic, NULL, &bands); /* * To test for WPA support, we need to see if we can @@ -890,21 +893,16 @@ ic->ic_caps |= IEEE80211_C_PMGT; bcopy(eaddr, &ic->ic_myaddr, sizeof(eaddr)); ieee80211_ifattach(ic); - ieee80211_media_init(ic, ieee80211_media_change, - ndis_media_status); ic->ic_scan_start = ndis_scan_start; ic->ic_scan_end = ndis_scan_end; ic->ic_set_channel = ndis_set_channel; ic->ic_scan_curchan = ndis_scan_curchan; ic->ic_scan_mindwell = ndis_scan_mindwell; ic->ic_bsschan = IEEE80211_CHAN_ANYC; - ic->ic_bss->ni_chan = ic->ic_bsschan; - /* override state transition machine */ - sc->ndis_newstate = ic->ic_newstate; - ic->ic_newstate = ndis_newstate; - /* install key handing routines */ - ic->ic_crypto.cs_key_set = ndis_add_key; - ic->ic_crypto.cs_key_delete = ndis_del_key; + //ic->ic_bss->ni_chan = ic->ic_bsschan; + ic->ic_vap_create = ndis_vap_create; + ic->ic_vap_delete = ndis_vap_delete; + } else { ifmedia_init(&sc->ifmedia, IFM_IMASK, ndis_ifmedia_upd, ndis_ifmedia_sts); @@ -928,6 +926,45 @@ return(error); } +static struct ieee80211vap * +ndis_vap_create(struct ieee80211com *ic, + const char name[IFNAMSIZ], int unit, int opmode, int flags, + const uint8_t bssid[IEEE80211_ADDR_LEN], + const uint8_t mac[IEEE80211_ADDR_LEN]) +{ + struct ndis_vap *nvp; + struct ieee80211vap *vap; + + if (!TAILQ_EMPTY(&ic->ic_vaps)) /* only one at a time */ + return NULL; + nvp = (struct ndis_vap *) malloc(sizeof(struct ndis_vap), + M_80211_VAP, M_NOWAIT | M_ZERO); + if (nvp == NULL) + return NULL; + vap = &nvp->vap; + ieee80211_vap_setup(ic, vap, name, unit, opmode, flags, bssid, mac); + /* override with driver methods */ + nvp->newstate = vap->iv_newstate; + vap->iv_newstate = ndis_newstate; + + /* complete setup */ + ieee80211_vap_attach(vap, ieee80211_media_change, ieee80211_media_status); + ic->ic_opmode = opmode; + /* install key handing routines */ + vap->iv_key_set = ndis_add_key; + vap->iv_key_delete = ndis_del_key; + return vap; +} + +static void +ndis_vap_delete(struct ieee80211vap *vap) +{ + struct ndis_vap *nvp = NDIS_VAP(vap); + + ieee80211_vap_detach(vap); + free(nvp, M_80211_VAP); +} + /* * Shutdown hardware and free up resources. This can be called any * time after the mutex has been initialized. It is called in both @@ -1422,10 +1459,14 @@ struct ifnet *ifp; struct ndis_softc *sc; struct mbuf *m; + struct ieee80211com *ic; + struct ieee80211vap *vap; uint8_t irql; ifp = arg; sc = ifp->if_softc; + ic = &sc->ic; + vap = TAILQ_FIRST(&ic->ic_vaps); block = dobj->do_devext; KeAcquireSpinLock(&sc->ndis_rxlock, &irql); @@ -1434,8 +1475,10 @@ if (m == NULL) break; KeReleaseSpinLock(&sc->ndis_rxlock, irql); - ifp->if_ipackets++; - (*ifp->if_input)(ifp, m); + if (sc->ndis_80211) + vap->iv_deliver_data(vap, vap->iv_bss, m); + else + (*ifp->if_input)(ifp, m); KeAcquireSpinLock(&sc->ndis_rxlock, &irql); } KeReleaseSpinLock(&sc->ndis_rxlock, irql); @@ -1604,11 +1647,13 @@ { struct ndis_softc *sc; struct ieee80211com *ic; + struct ieee80211vap *vap; ndis_checkforhang_handler hangfunc; uint8_t rval; sc = xsc; ic = &sc->ic; + vap = TAILQ_FIRST(&ic->ic_vaps); NDIS_LOCK(sc); if (!NDIS_INITIALIZED(sc)) { @@ -1635,7 +1680,7 @@ NDIS_UNLOCK(sc); if (sc->ndis_80211) { ndis_getstate_80211(sc); - ieee80211_new_state(ic, IEEE80211_S_RUN, -1); + ieee80211_new_state(vap, IEEE80211_S_RUN, -1); } NDIS_LOCK(sc); if_link_state_change(sc->ifp, LINK_STATE_UP); @@ -1645,7 +1690,7 @@ sc->ndis_sts == NDIS_STATUS_MEDIA_DISCONNECT) { sc->ndis_link = 0; if (sc->ndis_80211) - ieee80211_new_state(ic, IEEE80211_S_SCAN, 0); + ieee80211_new_state(vap, IEEE80211_S_SCAN, 0); if_link_state_change(sc->ifp, LINK_STATE_DOWN); } @@ -1854,7 +1899,7 @@ * fixing the upper layer modules so they don't * call ifp->if_init() quite as often. */ - if (sc->ndis_link && sc->ndis_skip) + if (sc->ndis_link) return; /* @@ -1912,23 +1957,14 @@ if_link_state_change(sc->ifp, LINK_STATE_UNKNOWN); - if (ic->ic_opmode != IEEE80211_M_MONITOR) { - /* - * NB: When restarting the adapter clock the state - * machine regardless of the roaming mode; otherwise - * we need to notify user apps so they can manually - * get us going again. - */ - if (ic->ic_roaming != IEEE80211_ROAMING_MANUAL) - ieee80211_new_state(ic, IEEE80211_S_SCAN, 0); - } else - ieee80211_new_state(ic, IEEE80211_S_RUN, -1); - ifp->if_drv_flags |= IFF_DRV_RUNNING; ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; NDIS_UNLOCK(sc); + /* XXX force handling */ + ieee80211_start_all(ic); /* start all vap's */ + /* * Some drivers don't set this value. The NDIS spec says * the default checkforhang timeout is "approximately 2 @@ -2070,18 +2106,17 @@ */ static int -ndis_set_wpa(sc) +ndis_set_wpa(sc, ie, ielen) struct ndis_softc *sc; + void *ie; + int ielen; { - struct ieee80211com *ic; struct ieee80211_ie_wpa *w; struct ndis_ie *n; char *pos; uint32_t arg; int i; - ic = &sc->ic; - /* * Apparently, the only way for us to know what ciphers * and key management/authentication mode to use is for @@ -2090,7 +2125,7 @@ * supplied by the WPA supplicant. */ - w = (struct ieee80211_ie_wpa *)ic->ic_opt_ie; + w = (struct ieee80211_ie_wpa *)ie; /* Check for the right kind of IE. */ if (w->wpa_id != IEEE80211_ELEMID_VENDOR) { @@ -2153,18 +2188,20 @@ struct ndis_softc *sc; { struct ieee80211com *ic; + struct ieee80211vap *vap; struct ieee80211_node *ni; ndis_80211_ssid ssid; ndis_80211_macaddr bssid; ndis_80211_config config; ndis_80211_wep wep; - int i, rval = 0, len; + int i, rval = 0, len, error; uint32_t arg; struct ifnet *ifp; ic = &sc->ic; ifp = sc->ifp; - ni = ic->ic_bss; + vap = TAILQ_FIRST(&ic->ic_vaps); + ni = vap->iv_bss; if (!NDIS_INITIALIZED(sc)) { DPRINTF(("%s: NDIS not initialized\n", __func__)); @@ -2180,7 +2217,7 @@ /* Set network infrastructure mode. */ len = sizeof(arg); - if (ic->ic_opmode == IEEE80211_M_IBSS) + if (vap->iv_opmode == IEEE80211_M_IBSS) arg = NDIS_80211_NET_INFRA_IBSS; else arg = NDIS_80211_NET_INFRA_BSS; @@ -2193,13 +2230,13 @@ /* Set RTS threshold */ len = sizeof(arg); - arg = ic->ic_rtsthreshold; + arg = vap->iv_rtsthreshold; ndis_set_info(sc, OID_802_11_RTS_THRESHOLD, &arg, &len); /* Set fragmentation threshold */ len = sizeof(arg); - arg = ic->ic_fragthreshold; + arg = vap->iv_fragthreshold; ndis_set_info(sc, OID_802_11_FRAGMENTATION_THRESHOLD, &arg, &len); /* Set power management */ @@ -2234,11 +2271,11 @@ /* Set WEP */ - if (ic->ic_flags & IEEE80211_F_PRIVACY && - !(ic->ic_flags & IEEE80211_F_WPA)) { + if (vap->iv_flags & IEEE80211_F_PRIVACY && + !(vap->iv_flags & IEEE80211_F_WPA)) { int keys_set = 0; - if (ic->ic_bss->ni_authmode == IEEE80211_AUTH_SHARED) { + if (ni->ni_authmode == IEEE80211_AUTH_SHARED) { len = sizeof(arg); arg = NDIS_80211_AUTHMODE_SHARED; DPRINTF(("Setting shared auth\n")); @@ -2246,12 +2283,12 @@ &arg, &len); } for (i = 0; i < IEEE80211_WEP_NKID; i++) { - if (ic->ic_nw_keys[i].wk_keylen) { - if (ic->ic_nw_keys[i].wk_cipher->ic_cipher != + if (vap->iv_nw_keys[i].wk_keylen) { + if (vap->iv_nw_keys[i].wk_cipher->ic_cipher != IEEE80211_CIPHER_WEP) continue; bzero((char *)&wep, sizeof(wep)); - wep.nw_keylen = ic->ic_nw_keys[i].wk_keylen; + wep.nw_keylen = vap->iv_nw_keys[i].wk_keylen; /* * 5, 13 and 16 are the only valid @@ -2259,21 +2296,21 @@ * in between will be zero padded out to * the next highest boundary. */ - if (ic->ic_nw_keys[i].wk_keylen < 5) + if (vap->iv_nw_keys[i].wk_keylen < 5) wep.nw_keylen = 5; - else if (ic->ic_nw_keys[i].wk_keylen > 5 && - ic->ic_nw_keys[i].wk_keylen < 13) + else if (vap->iv_nw_keys[i].wk_keylen > 5 && + vap->iv_nw_keys[i].wk_keylen < 13) wep.nw_keylen = 13; - else if (ic->ic_nw_keys[i].wk_keylen > 13 && - ic->ic_nw_keys[i].wk_keylen < 16) + else if (vap->iv_nw_keys[i].wk_keylen > 13 && + vap->iv_nw_keys[i].wk_keylen < 16) wep.nw_keylen = 16; wep.nw_keyidx = i; wep.nw_length = (sizeof(uint32_t) * 3) + wep.nw_keylen; - if (i == ic->ic_def_txkey) + if (i == vap->iv_def_txkey) wep.nw_keyidx |= NDIS_80211_WEPKEY_TX; - bcopy(ic->ic_nw_keys[i].wk_key, + bcopy(vap->iv_nw_keys[i].wk_key, wep.nw_keydata, wep.nw_length); len = sizeof(wep); DPRINTF(("Setting WEP key %d\n", i)); @@ -2294,7 +2331,7 @@ if (rval) device_printf(sc->ndis_dev, "enable WEP failed: %d\n", rval); - if (ic->ic_flags & IEEE80211_F_DROPUNENC) + if (vap->iv_flags & IEEE80211_F_DROPUNENC) arg = NDIS_80211_PRIVFILT_8021XWEP; else arg = NDIS_80211_PRIVFILT_ACCEPTALL; @@ -2303,20 +2340,23 @@ ndis_set_info(sc, OID_802_11_PRIVACY_FILTER, &arg, &len); } - } + } /* Set up WPA. */ - if (ic->ic_flags & IEEE80211_F_WPA1 && ic->ic_opt_ie_len && - ic->ic_caps & IEEE80211_C_WPA) - if (ndis_set_wpa(sc)) + if ((vap->iv_flags & IEEE80211_F_WPA) && + vap->iv_appie_assocreq != NULL) { + struct ieee80211_appie *ie = vap->iv_appie_assocreq; + error = ndis_set_wpa(sc, ie->ie_data, ie->ie_len); + if (error != 0) device_printf(sc->ndis_dev, "WPA setup failed\n"); + } #ifdef notyet /* Set network type. */ arg = 0; - switch (ic->ic_curmode) { + switch (vap->iv_curmode) { case IEEE80211_MODE_11A: arg = NDIS_80211_NETTYPE_11OFDM5; break; @@ -2328,7 +2368,7 @@ break; default: device_printf(sc->ndis_dev, "unknown mode: %d\n", - ic->ic_curmode); + vap->iv_curmode); } if (arg) { @@ -2368,7 +2408,7 @@ if (chan != ieee80211_mhz2ieee(config.nc_dsconfig / 1000, 0)) { config.nc_dsconfig = ic->ic_bsschan->ic_freq * 1000; - ic->ic_bss->ni_chan = ic->ic_bsschan; + ni->ni_chan = ic->ic_bsschan; len = sizeof(config); config.nc_length = len; config.nc_fhconfig.ncf_length = @@ -2400,8 +2440,8 @@ */ len = IEEE80211_ADDR_LEN; - if (ic->ic_flags & IEEE80211_F_DESBSSID && - ic->ic_opmode != IEEE80211_M_IBSS) + if (vap->iv_flags & IEEE80211_F_DESBSSID && + vap->iv_opmode != IEEE80211_M_IBSS) bcopy(ni->ni_bssid, bssid, len); else bcopy(ifp->if_broadcastaddr, bssid, len); @@ -2435,67 +2475,12 @@ if (rval) device_printf (sc->ndis_dev, "set ssid failed: %d\n", rval); - if (ic->ic_state == IEEE80211_S_AUTH) - ieee80211_new_state(ic, IEEE80211_S_ASSOC, 0); + if (vap->iv_state == IEEE80211_S_AUTH) + ieee80211_new_state(vap, IEEE80211_S_ASSOC, 0); return; } -static void -ndis_media_status(struct ifnet *ifp, struct ifmediareq *imr) -{ - struct ieee80211com *ic = &((struct ndis_softc *)ifp->if_softc)->ic; - struct ieee80211_node *ni = NULL; - - imr->ifm_status = IFM_AVALID; - imr->ifm_active = IFM_IEEE80211; - if (ic->ic_state == IEEE80211_S_RUN) - imr->ifm_status |= IFM_ACTIVE; - imr->ifm_active |= IFM_AUTO; - switch (ic->ic_opmode) { - case IEEE80211_M_STA: - ni = ic->ic_bss; - /* calculate rate subtype */ - imr->ifm_active |= ieee80211_rate2media(ic, - ni->ni_rates.rs_rates[ni->ni_txrate], ic->ic_curmode); - break; - case IEEE80211_M_IBSS: - ni = ic->ic_bss; - /* calculate rate subtype */ - imr->ifm_active |= ieee80211_rate2media(ic, - ni->ni_rates.rs_rates[ni->ni_txrate], ic->ic_curmode); - imr->ifm_active |= IFM_IEEE80211_ADHOC; - break; - case IEEE80211_M_AHDEMO: - /* should not come here */ - break; - case IEEE80211_M_HOSTAP: - imr->ifm_active |= IFM_IEEE80211_HOSTAP; - break; - case IEEE80211_M_MONITOR: - imr->ifm_active |= IFM_IEEE80211_MONITOR; - break; - case IEEE80211_M_WDS: - printf("WARNING: WDS operation mode not supported by NDIS\n"); - break; - } - switch (ic->ic_curmode) { - case IEEE80211_MODE_11A: - imr->ifm_active |= IFM_MAKEMODE(IFM_IEEE80211_11A); - break; - case IEEE80211_MODE_11B: - imr->ifm_active |= IFM_MAKEMODE(IFM_IEEE80211_11B); - break; - case IEEE80211_MODE_11G: - imr->ifm_active |= IFM_MAKEMODE(IFM_IEEE80211_11G); - break; - case IEEE80211_MODE_TURBO_A: - imr->ifm_active |= IFM_MAKEMODE(IFM_IEEE80211_11A) - | IFM_IEEE80211_TURBO; - break; - } -} - static int ndis_get_assoc(sc, assoc) struct ndis_softc *sc; @@ -2560,6 +2545,8 @@ struct ndis_softc *sc; { struct ieee80211com *ic; + struct ieee80211vap *vap; + struct ieee80211_node *ni; ndis_wlan_bssid_ex *bs; int rval, len, i = 0; int chanflag; @@ -2567,7 +2554,9 @@ struct ifnet *ifp; ic = &sc->ic; + vap = TAILQ_FIRST(&ic->ic_vaps); ifp = sc->ifp; + ni = vap->iv_bss; if (!NDIS_INITIALIZED(sc)) return; @@ -2578,12 +2567,12 @@ /* We're associated, retrieve info on the current bssid. */ ic->ic_curmode = ndis_nettype_mode(bs->nwbx_nettype); chanflag = ndis_nettype_chan(bs->nwbx_nettype); - IEEE80211_ADDR_COPY(ic->ic_bss->ni_bssid, bs->nwbx_macaddr); + IEEE80211_ADDR_COPY(ni->ni_bssid, bs->nwbx_macaddr); /* Get SSID from current association info. */ - bcopy(bs->nwbx_ssid.ns_ssid, ic->ic_bss->ni_essid, + bcopy(bs->nwbx_ssid.ns_ssid, ni->ni_essid, bs->nwbx_ssid.ns_ssidlen); - ic->ic_bss->ni_esslen = bs->nwbx_ssid.ns_ssidlen; + ni->ni_esslen = bs->nwbx_ssid.ns_ssidlen; len = sizeof(arg); rval = ndis_get_info(sc, OID_GEN_LINK_SPEED, &arg, &len); @@ -2592,29 +2581,29 @@ rval); if (isset(ic->ic_modecaps, IEEE80211_MODE_11B)) { - ic->ic_bss->ni_rates = ic->ic_sup_rates[IEEE80211_MODE_11B]; - for (i = 0; i < ic->ic_bss->ni_rates.rs_nrates; i++) { - if ((ic->ic_bss->ni_rates.rs_rates[i] & + ni->ni_rates = ic->ic_sup_rates[IEEE80211_MODE_11B]; + for (i = 0; i < ni->ni_rates.rs_nrates; i++) { + if ((ni->ni_rates.rs_rates[i] & IEEE80211_RATE_VAL) == arg / 5000) break; } } - if (i == ic->ic_bss->ni_rates.rs_nrates && + if (i == ni->ni_rates.rs_nrates && isset(ic->ic_modecaps, IEEE80211_MODE_11G)) { - ic->ic_bss->ni_rates = ic->ic_sup_rates[IEEE80211_MODE_11G]; - for (i = 0; i < ic->ic_bss->ni_rates.rs_nrates; i++) { - if ((ic->ic_bss->ni_rates.rs_rates[i] & + ni->ni_rates = ic->ic_sup_rates[IEEE80211_MODE_11G]; + for (i = 0; i < ni->ni_rates.rs_nrates; i++) { + if ((ni->ni_rates.rs_rates[i] & IEEE80211_RATE_VAL) == arg / 5000) break; } } - if (i == ic->ic_bss->ni_rates.rs_nrates) + if (i == ni->ni_rates.rs_nrates) device_printf(sc->ndis_dev, "no matching rate for: %d\n", arg / 5000); else - ic->ic_bss->ni_txrate = i; + ni->ni_txrate = i; if (ic->ic_caps & IEEE80211_C_PMGT) { len = sizeof(arg); @@ -2637,7 +2626,7 @@ bs->nwbx_config.nc_dsconfig / 1000, chanflag); if (ic->ic_curchan == NULL) ic->ic_curchan = &ic->ic_channels[0]; - ic->ic_bss->ni_chan = ic->ic_curchan; + ni->ni_chan = ic->ic_curchan; ic->ic_bsschan = ic->ic_curchan; free(bs, M_TEMP); @@ -2656,27 +2645,27 @@ ic->ic_flags &= ~IEEE80211_F_WPA; switch(arg) { case NDIS_80211_AUTHMODE_OPEN: - ic->ic_bss->ni_authmode = IEEE80211_AUTH_OPEN; + ni->ni_authmode = IEEE80211_AUTH_OPEN; break; case NDIS_80211_AUTHMODE_SHARED: - ic->ic_bss->ni_authmode = IEEE80211_AUTH_SHARED; + ni->ni_authmode = IEEE80211_AUTH_SHARED; break; case NDIS_80211_AUTHMODE_AUTO: - ic->ic_bss->ni_authmode = IEEE80211_AUTH_AUTO; + ni->ni_authmode = IEEE80211_AUTH_AUTO; break; case NDIS_80211_AUTHMODE_WPA: case NDIS_80211_AUTHMODE_WPAPSK: case NDIS_80211_AUTHMODE_WPANONE: - ic->ic_bss->ni_authmode = IEEE80211_AUTH_WPA; + ni->ni_authmode = IEEE80211_AUTH_WPA; ic->ic_flags |= IEEE80211_F_WPA1; break; case NDIS_80211_AUTHMODE_WPA2: case NDIS_80211_AUTHMODE_WPA2PSK: - ic->ic_bss->ni_authmode = IEEE80211_AUTH_WPA; + ni->ni_authmode = IEEE80211_AUTH_WPA; ic->ic_flags |= IEEE80211_F_WPA2; break; default: - ic->ic_bss->ni_authmode = IEEE80211_AUTH_NONE; + ni->ni_authmode = IEEE80211_AUTH_NONE; break; } } @@ -2747,14 +2736,7 @@ break; case SIOCGIFMEDIA: case SIOCSIFMEDIA: - if (sc->ndis_80211) { - error = ieee80211_ioctl(&sc->ic, command, data); - if (error == ENETRESET) { - ndis_setstate_80211(sc); - /*ndis_init(sc);*/ - error = 0; - } - } else + if (!sc->ndis_80211) error = ifmedia_ioctl(ifp, ifr, &sc->ifmedia, command); break; case SIOCSIFCAP: @@ -2765,22 +2747,6 @@ ifp->if_hwassist = 0; ndis_set_offload(sc); break; - case SIOCG80211: - if (!NDIS_INITIALIZED(sc)) - goto do_80211; - if (sc->ndis_80211) - error = ndis_80211_ioctl_get(ifp, command, data); - else - error = ENOTTY; - break; - case SIOCS80211: - if (!NDIS_INITIALIZED(sc)) - goto do_80211; - if (sc->ndis_80211) - error = ndis_80211_ioctl_set(ifp, command, data); - else - error = ENOTTY; - break; case SIOCGDRVSPEC: if ((error = priv_check(curthread, PRIV_DRIVER))) break; @@ -2881,17 +2847,8 @@ NDIS_UNLOCK(sc); break; default: -do_80211: - sc->ndis_skip = 1; - if (sc->ndis_80211) { - error = ieee80211_ioctl(&sc->ic, command, data); - if (error == ENETRESET) { - ndis_setstate_80211(sc); - error = 0; - } - } else + if (!sc->ndis_80211) error = ether_ioctl(ifp, command, data); - sc->ndis_skip = 0; break; } @@ -2900,55 +2857,16 @@ return(error); } -static int -ndis_80211_ioctl_get(struct ifnet *ifp, u_long command, caddr_t data) -{ - struct ndis_softc *sc; - struct ieee80211req *ireq; - int error, len; - uint16_t nodename_u[IEEE80211_NWID_LEN + 1]; - unicode_string us; - ansi_string as; - - sc = ifp->if_softc; - ireq = (struct ieee80211req *) data; - - switch (ireq->i_type) { - case IEEE80211_IOC_MLME: - error = 0; - break; - case IEEE80211_IOC_STATIONNAME: - error = ndis_get_info(sc, OID_GEN_MACHINE_NAME, - &nodename_u, &len); - if (error) - break; - us.us_len = us.us_maxlen = len; - us.us_buf = nodename_u; - if (RtlUnicodeStringToAnsiString(&as, &us, TRUE)) { - error = ENOMEM; - break; - } - ireq->i_len = as.as_len; - error = copyout(as.as_buf, ireq->i_data, ireq->i_len); - RtlFreeAnsiString(&as); - break; - default: - error = ieee80211_ioctl(&sc->ic, command, data); - break; - } - return(error); -} - int -ndis_del_key(ic, key) - struct ieee80211com *ic; +ndis_del_key(vap, key) + struct ieee80211vap *vap; const struct ieee80211_key *key; { struct ndis_softc *sc; ndis_80211_key rkey; int len, error = 0; - sc = ic->ic_ifp->if_softc; + sc = vap->iv_ic->ic_ifp->if_softc; bzero((char *)&rkey, sizeof(rkey)); len = sizeof(rkey); @@ -2956,7 +2874,7 @@ rkey.nk_len = len; rkey.nk_keyidx = key->wk_keyix; - bcopy(ic->ic_ifp->if_broadcastaddr, + bcopy(vap->iv_ifp->if_broadcastaddr, rkey.nk_bssid, IEEE80211_ADDR_LEN); error = ndis_set_info(sc, OID_802_11_REMOVE_KEY, &rkey, &len); @@ -2974,16 +2892,18 @@ */ static int -ndis_add_key(ic, key, mac) - struct ieee80211com *ic; +ndis_add_key(vap, key, mac) + struct ieee80211vap *vap; const struct ieee80211_key *key; const uint8_t mac[IEEE80211_ADDR_LEN]; { struct ndis_softc *sc; + struct ifnet *ifp; ndis_80211_key rkey; int len, error = 0; - sc = ic->ic_ifp->if_softc; + ifp = vap->iv_ic->ic_ifp; + sc = ifp->if_softc; switch (key->wk_cipher->ic_cipher) { case IEEE80211_CIPHER_TKIP: @@ -3008,17 +2928,17 @@ rkey.nk_keyidx |= 1 << 31; if (key->wk_flags & IEEE80211_KEY_GROUP) { - bcopy(ic->ic_ifp->if_broadcastaddr, + bcopy(ifp->if_broadcastaddr, rkey.nk_bssid, IEEE80211_ADDR_LEN); } else { - bcopy(ic->ic_bss->ni_bssid, + bcopy(vap->iv_bss->ni_bssid, rkey.nk_bssid, IEEE80211_ADDR_LEN); /* pairwise key */ rkey.nk_keyidx |= 1 << 30; } /* need to set bit 29 based on keyrsc */ - rkey.nk_keyrsc = key->wk_keyrsc; + rkey.nk_keyrsc = key->wk_keyrsc[0]; /* XXX need tid */ if (rkey.nk_keyrsc) rkey.nk_keyidx |= 1 << 29; @@ -3053,54 +2973,6 @@ return (1); } -static int -ndis_80211_ioctl_set(struct ifnet *ifp, u_long command, caddr_t data) -{ - struct ndis_softc *sc; - struct ieee80211req *ireq; - int error = EINVAL, len; - ansi_string as; - unicode_string us; - - sc = ifp->if_softc; - ireq = (struct ieee80211req *) data; - - switch (ireq->i_type) { - case IEEE80211_IOC_COUNTERMEASURES: - case IEEE80211_IOC_DROPUNENCRYPTED: - error = 0; - break; - case IEEE80211_IOC_STATIONNAME: - error = priv_check(curthread, PRIV_NET80211_MANAGE); - if (error) - break; - if (ireq->i_val != 0 || - ireq->i_len > IEEE80211_NWID_LEN) { - error = EINVAL; - break; - } - as.as_len = as.as_maxlen = ireq->i_len; - as.as_buf = ireq->i_data; - if (RtlAnsiStringToUnicodeString(&us, &as, TRUE)) { - error = ENOMEM; - break; - } - len = us.us_len; - error = ndis_set_info(sc, OID_GEN_MACHINE_NAME, - us.us_buf, &len); - RtlFreeUnicodeString(&us); - break; - default: - error = ieee80211_ioctl(&sc->ic, command, data); - if (error == ENETRESET) { - ndis_setstate_80211(sc); - error = 0; - } - } - - return(error); -} - static void ndis_resettask(d, arg) device_object *d; @@ -3149,8 +3021,6 @@ int i; ic = &sc->ic; - if (sc->ndis_80211) - ieee80211_new_state(ic, IEEE80211_S_INIT, -1); ifp = sc->ifp; untimeout(ndis_tick, sc, sc->ndis_stat_ch); @@ -3194,24 +3064,26 @@ } static int -ndis_newstate(struct ieee80211com *ic, enum ieee80211_state nstate, int arg) +ndis_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) { + struct ndis_vap *nvp = NDIS_VAP(vap); + struct ieee80211com *ic = vap->iv_ic; struct ifnet *ifp = ic->ic_ifp; struct ndis_softc *sc = ifp->if_softc; - enum ieee80211_state ostate; + enum ieee80211_state ostate; DPRINTF(("%s: %s -> %s\n", __func__, - ieee80211_state_name[ic->ic_state], + ieee80211_state_name[vap->iv_state], ieee80211_state_name[nstate])); - ostate = ic->ic_state; - ic->ic_state = nstate; + ostate = vap->iv_state; + vap->iv_state = nstate; switch (nstate) { /* pass on to net80211 */ case IEEE80211_S_INIT: case IEEE80211_S_SCAN: - return (sc->ndis_newstate(ic, nstate, arg)); + return nvp->newstate(vap, nstate, arg); case IEEE80211_S_ASSOC: if (ostate != IEEE80211_S_AUTH) @@ -3233,13 +3105,16 @@ { struct ndis_softc *sc = arg; struct ieee80211com *ic = (void *)&sc->ic; + struct ieee80211vap *vap; struct ieee80211_scan_state *ss = ic->ic_scan; ndis_80211_ssid ssid; int error, len; + vap = TAILQ_FIRST(&ic->ic_vaps); + if (!NDIS_INITIALIZED(sc)) { DPRINTF(("%s: scan aborted\n", __func__)); - ieee80211_cancel_scan(ic); + ieee80211_cancel_scan(vap); return; } @@ -3260,7 +3135,7 @@ NULL, &len); if (error) { DPRINTF(("%s: scan command failed\n", __func__)); - ieee80211_cancel_scan(ic); + ieee80211_cancel_scan(vap); return; } @@ -3270,13 +3145,14 @@ return; ndis_scan_results(sc); - ieee80211_scan_done(ic); + ieee80211_scan_done(vap); } static void ndis_scan_results(struct ndis_softc *sc) { struct ieee80211com *ic = (void *)&sc->ic; + struct ieee80211vap *vap; ndis_80211_bssid_list_ex *bl; ndis_wlan_bssid_ex *wb; struct ieee80211_scanparams sp; @@ -3288,6 +3164,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Mar 30 15:01:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 96AA61065673; Sun, 30 Mar 2008 15:01:14 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3C62F106566B for ; Sun, 30 Mar 2008 15:01:14 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2E3F68FC1D for ; Sun, 30 Mar 2008 15:01:14 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2UF1EKn084150 for ; Sun, 30 Mar 2008 15:01:14 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2UF1D3Z084148 for perforce@freebsd.org; Sun, 30 Mar 2008 15:01:13 GMT (envelope-from piso@freebsd.org) Date: Sun, 30 Mar 2008 15:01:13 GMT Message-Id: <200803301501.m2UF1D3Z084148@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 138984 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Mar 2008 15:01:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=138984 Change 138984 by piso@piso_newluxor on 2008/03/30 15:01:09 Fix a pointer dereference in LibAliasIn(), while here leave some debug around. Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/ip_fw_nat.c#4 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#74 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/ip_fw_nat.c#4 (text+ko) ==== @@ -312,7 +312,8 @@ m->m_pkthdr.csum_flags & CSUM_DELAY_DATA) ldt = 1; - + + printf("bef ip_len: %d ip_hl: %d\n", ntohs(ip->ip_len), ip->ip_hl); if (args->oif == NULL) retval = LibAliasIn(t->lib, &m, MCLBYTES); @@ -320,7 +321,7 @@ retval = LibAliasOut(t->lib, &m, MCLBYTES); if (retval != PKT_ALIAS_OK) { - printf("retval: "); + printf("retval: %d", retval); /* XXX - should i add some logging? */ m_free(m); badnat: ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#74 (text+ko) ==== @@ -282,6 +282,7 @@ IcmpAliasIn1(struct libalias *la, struct ip *pip, struct icmp *ic) { + printf("%s\n", __FUNCTION__); LIBALIAS_LOCK_ASSERT(la); /* De-alias incoming echo and timestamp replies. @@ -324,6 +325,7 @@ IcmpAliasIn2(struct libalias *la, pkt_t ptr) { + printf("%s\n", __FUNCTION__); LIBALIAS_LOCK_ASSERT(la); /* Alias incoming ICMP error messages containing @@ -430,6 +432,7 @@ struct ip *pip; struct icmp *ic; + printf("%s\n", __FUNCTION__); LIBALIAS_LOCK_ASSERT(la); /* Return if proxy-only mode is enabled */ if (la->packetAliasMode & PKT_ALIAS_PROXY_ONLY) @@ -1255,6 +1258,7 @@ struct ip *pip; int iresult; + printf("%s\n", __FUNCTION__); if (la->packetAliasMode & PKT_ALIAS_REVERSE) { la->packetAliasMode &= ~PKT_ALIAS_REVERSE; iresult = LibAliasOutLocked(la, ptr, maxpacketsize, 1); @@ -1264,26 +1268,32 @@ HouseKeeping(la); ClearCheckNewLink(la); PULLUP_IPHDR(pip, ptr); - pip = (struct ip *)ptr; alias_addr = pip->ip_dst; /* Defense against mangled packets */ if (ntohs(pip->ip_len) > maxpacketsize || (pip->ip_hl << 2) > maxpacketsize) { + printf("%d\n", __LINE__); + printf("maxpktsize: %d ip_len: %d ip_hl: %d\n", maxpacketsize, + ntohs(pip->ip_len), pip->ip_hl); iresult = PKT_ALIAS_IGNORED; goto getout; } iresult = PKT_ALIAS_IGNORED; if ((ntohs(pip->ip_off) & IP_OFFMASK) == 0) { + printf("%d\n", __LINE__); switch (pip->ip_p) { case IPPROTO_ICMP: + printf("%d\n", __LINE__); iresult = IcmpAliasIn(la, ptr); break; case IPPROTO_UDP: + printf("%d\n", __LINE__); iresult = UdpAliasIn(la, ptr); break; case IPPROTO_TCP: + printf("%d\n", __LINE__); iresult = TcpAliasIn(la, ptr); break; case IPPROTO_GRE: { @@ -1308,6 +1318,7 @@ } break; default: + printf("%d\n", __LINE__); iresult = ProtoAliasIn(la, pip->ip_src, &pip->ip_dst, pip->ip_p, &pip->ip_sum); break; @@ -1325,6 +1336,7 @@ } } } else { + printf("%d\n", __LINE__); iresult = FragmentIn(la, pip->ip_src, &pip->ip_dst, pip->ip_id, &pip->ip_sum); } From owner-p4-projects@FreeBSD.ORG Sun Mar 30 16:19:41 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8485B106566B; Sun, 30 Mar 2008 16:19:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4437D1065673 for ; Sun, 30 Mar 2008 16:19:41 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 16E308FC1B for ; Sun, 30 Mar 2008 16:19:41 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2UGJee0092580 for ; Sun, 30 Mar 2008 16:19:40 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2UGJeEs092578 for perforce@freebsd.org; Sun, 30 Mar 2008 16:19:40 GMT (envelope-from piso@freebsd.org) Date: Sun, 30 Mar 2008 16:19:40 GMT Message-Id: <200803301619.m2UGJeEs092578@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 138988 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Mar 2008 16:19:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=138988 Change 138988 by piso@piso_newluxor on 2008/03/30 16:18:54 Let fragment pass. Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/ip_fw_nat.c#5 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/ip_fw_nat.c#5 (text+ko) ==== @@ -320,7 +320,8 @@ else retval = LibAliasOut(t->lib, &m, MCLBYTES); - if (retval != PKT_ALIAS_OK) { + if (retval != PKT_ALIAS_OK && + retval != PKT_ALIAS_FOUND_HEADER_FRAGMENT) { printf("retval: %d", retval); /* XXX - should i add some logging? */ m_free(m); From owner-p4-projects@FreeBSD.ORG Sun Mar 30 19:25:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2A9CC1065678; Sun, 30 Mar 2008 19:25:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DAB53106566C for ; Sun, 30 Mar 2008 19:25:03 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BB8758FC17 for ; Sun, 30 Mar 2008 19:25:03 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2UJP3Et011629 for ; Sun, 30 Mar 2008 19:25:03 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2UJP2Lg011624 for perforce@freebsd.org; Sun, 30 Mar 2008 19:25:02 GMT (envelope-from piso@freebsd.org) Date: Sun, 30 Mar 2008 19:25:02 GMT Message-Id: <200803301925.m2UJP2Lg011624@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 139002 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Mar 2008 19:25:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=139002 Change 139002 by piso@piso_newluxor on 2008/03/30 19:24:29 IFC@139000 Affected files ... .. //depot/projects/soc2005/libalias/Makefile.inc1#17 integrate .. //depot/projects/soc2005/libalias/ObsoleteFiles.inc#28 integrate .. //depot/projects/soc2005/libalias/cddl/Makefile.inc#4 integrate .. //depot/projects/soc2005/libalias/cddl/compat/opensolaris/include/alloca.h#1 branch .. //depot/projects/soc2005/libalias/cddl/compat/opensolaris/include/devid.h#1 branch .. //depot/projects/soc2005/libalias/cddl/compat/opensolaris/include/fcntl.h#1 branch .. //depot/projects/soc2005/libalias/cddl/compat/opensolaris/include/fsshare.h#1 branch .. //depot/projects/soc2005/libalias/cddl/compat/opensolaris/include/libintl.h#1 branch .. //depot/projects/soc2005/libalias/cddl/compat/opensolaris/include/mnttab.h#1 branch .. //depot/projects/soc2005/libalias/cddl/compat/opensolaris/include/priv.h#1 branch .. //depot/projects/soc2005/libalias/cddl/compat/opensolaris/include/solaris.h#1 branch .. //depot/projects/soc2005/libalias/cddl/compat/opensolaris/include/stdio.h#1 branch .. //depot/projects/soc2005/libalias/cddl/compat/opensolaris/include/stdlib.h#1 branch .. //depot/projects/soc2005/libalias/cddl/compat/opensolaris/include/strings.h#1 branch .. //depot/projects/soc2005/libalias/cddl/compat/opensolaris/include/unistd.h#1 branch .. //depot/projects/soc2005/libalias/cddl/compat/opensolaris/include/zone.h#1 branch .. //depot/projects/soc2005/libalias/cddl/compat/opensolaris/lib/libumem/umem.c#1 branch .. //depot/projects/soc2005/libalias/cddl/compat/opensolaris/lib/libumem/umem.h#1 branch .. //depot/projects/soc2005/libalias/cddl/compat/opensolaris/misc/deviceid.c#1 branch .. //depot/projects/soc2005/libalias/cddl/compat/opensolaris/misc/fsshare.c#1 branch .. //depot/projects/soc2005/libalias/cddl/compat/opensolaris/misc/mkdirp.c#1 branch .. //depot/projects/soc2005/libalias/cddl/compat/opensolaris/misc/mnttab.c#1 branch .. //depot/projects/soc2005/libalias/cddl/compat/opensolaris/misc/zmount.c#1 branch .. //depot/projects/soc2005/libalias/cddl/compat/opensolaris/misc/zone.c#1 branch .. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/cmd/zdb/zdb.8#1 branch .. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/cmd/zdb/zdb.c#1 branch .. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c#1 branch .. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/cmd/zfs/zfs.8#1 branch .. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c#1 branch .. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h#1 branch .. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c#1 branch .. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/cmd/zfs/zfs_util.h#1 branch .. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/cmd/zpool/zpool.8#1 branch .. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/cmd/zpool/zpool_iter.c#1 branch .. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c#1 branch .. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/cmd/zpool/zpool_util.c#1 branch .. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h#1 branch .. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c#1 branch .. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/cmd/ztest/ztest.c#1 branch .. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/head/assert.h#1 branch .. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/head/atomic.h#1 branch .. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/head/libintl.h#1 branch .. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/head/stdio_ext.h#1 branch .. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/head/synch.h#1 branch .. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/head/thread.h#1 branch .. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c#1 branch .. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.h#1 branch .. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/lib/libnvpair/nvpair_alloc_system.c#1 branch .. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/lib/libuutil/common/libuutil.h#1 branch .. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#1 branch .. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/lib/libuutil/common/libuutil_impl.h#1 branch .. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#1 branch .. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/lib/libuutil/common/uu_avl.c#1 branch .. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c#1 branch .. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/lib/libuutil/common/uu_ident.c#1 branch .. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/lib/libuutil/common/uu_list.c#1 branch .. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/lib/libuutil/common/uu_misc.c#1 branch .. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/lib/libuutil/common/uu_open.c#1 branch .. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/lib/libuutil/common/uu_pname.c#1 branch .. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/lib/libuutil/common/uu_strtoint.c#1 branch .. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h#1 branch .. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#1 branch .. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#1 branch .. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#1 branch .. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#1 branch .. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#1 branch .. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#1 branch .. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#1 branch .. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#1 branch .. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#1 branch .. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#1 branch .. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c#1 branch .. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#1 branch .. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c#1 branch .. //depot/projects/soc2005/libalias/cddl/contrib/opensolaris/lib/libzpool/common/util.c#1 branch .. //depot/projects/soc2005/libalias/cddl/lib/Makefile#5 integrate .. //depot/projects/soc2005/libalias/cddl/lib/libavl/Makefile#3 integrate .. //depot/projects/soc2005/libalias/cddl/lib/libnvpair/Makefile#4 integrate .. //depot/projects/soc2005/libalias/cddl/lib/libumem/Makefile#3 integrate .. //depot/projects/soc2005/libalias/cddl/lib/libuutil/Makefile#3 integrate .. //depot/projects/soc2005/libalias/cddl/lib/libzfs/Makefile#4 integrate .. //depot/projects/soc2005/libalias/cddl/lib/libzpool/Makefile#4 integrate .. //depot/projects/soc2005/libalias/cddl/sbin/zfs/Makefile#4 integrate .. //depot/projects/soc2005/libalias/cddl/sbin/zpool/Makefile#4 integrate .. //depot/projects/soc2005/libalias/cddl/usr.bin/Makefile#5 integrate .. //depot/projects/soc2005/libalias/cddl/usr.bin/ztest/Makefile#4 integrate .. //depot/projects/soc2005/libalias/cddl/usr.sbin/Makefile#5 integrate .. //depot/projects/soc2005/libalias/cddl/usr.sbin/zdb/Makefile#4 integrate .. //depot/projects/soc2005/libalias/compat/opensolaris/include/alloca.h#2 delete .. //depot/projects/soc2005/libalias/compat/opensolaris/include/devid.h#3 delete .. //depot/projects/soc2005/libalias/compat/opensolaris/include/fcntl.h#2 delete .. //depot/projects/soc2005/libalias/compat/opensolaris/include/fsshare.h#2 delete .. //depot/projects/soc2005/libalias/compat/opensolaris/include/libintl.h#2 delete .. //depot/projects/soc2005/libalias/compat/opensolaris/include/mnttab.h#2 delete .. //depot/projects/soc2005/libalias/compat/opensolaris/include/priv.h#2 delete .. //depot/projects/soc2005/libalias/compat/opensolaris/include/solaris.h#2 delete .. //depot/projects/soc2005/libalias/compat/opensolaris/include/stdio.h#2 delete .. //depot/projects/soc2005/libalias/compat/opensolaris/include/stdlib.h#2 delete .. //depot/projects/soc2005/libalias/compat/opensolaris/include/strings.h#2 delete .. //depot/projects/soc2005/libalias/compat/opensolaris/include/unistd.h#2 delete .. //depot/projects/soc2005/libalias/compat/opensolaris/include/zone.h#2 delete .. //depot/projects/soc2005/libalias/compat/opensolaris/lib/libumem/umem.c#2 delete .. //depot/projects/soc2005/libalias/compat/opensolaris/lib/libumem/umem.h#2 delete .. //depot/projects/soc2005/libalias/compat/opensolaris/misc/deviceid.c#2 delete .. //depot/projects/soc2005/libalias/compat/opensolaris/misc/fsshare.c#3 delete .. //depot/projects/soc2005/libalias/compat/opensolaris/misc/mkdirp.c#2 delete .. //depot/projects/soc2005/libalias/compat/opensolaris/misc/mnttab.c#2 delete .. //depot/projects/soc2005/libalias/compat/opensolaris/misc/zmount.c#2 delete .. //depot/projects/soc2005/libalias/compat/opensolaris/misc/zone.c#2 delete .. //depot/projects/soc2005/libalias/contrib/opensolaris/OPENSOLARIS.LICENSE#2 delete .. //depot/projects/soc2005/libalias/contrib/opensolaris/cmd/zdb/zdb.8#3 delete .. //depot/projects/soc2005/libalias/contrib/opensolaris/cmd/zdb/zdb.c#4 delete .. //depot/projects/soc2005/libalias/contrib/opensolaris/cmd/zdb/zdb_il.c#2 delete .. //depot/projects/soc2005/libalias/contrib/opensolaris/cmd/zfs/zfs.8#3 delete .. //depot/projects/soc2005/libalias/contrib/opensolaris/cmd/zfs/zfs_iter.c#2 delete .. //depot/projects/soc2005/libalias/contrib/opensolaris/cmd/zfs/zfs_iter.h#2 delete .. //depot/projects/soc2005/libalias/contrib/opensolaris/cmd/zfs/zfs_main.c#3 delete .. //depot/projects/soc2005/libalias/contrib/opensolaris/cmd/zfs/zfs_util.h#2 delete .. //depot/projects/soc2005/libalias/contrib/opensolaris/cmd/zpool/zpool.8#3 delete .. //depot/projects/soc2005/libalias/contrib/opensolaris/cmd/zpool/zpool_iter.c#2 delete .. //depot/projects/soc2005/libalias/contrib/opensolaris/cmd/zpool/zpool_main.c#3 delete .. //depot/projects/soc2005/libalias/contrib/opensolaris/cmd/zpool/zpool_util.c#2 delete .. //depot/projects/soc2005/libalias/contrib/opensolaris/cmd/zpool/zpool_util.h#2 delete .. //depot/projects/soc2005/libalias/contrib/opensolaris/cmd/zpool/zpool_vdev.c#3 delete .. //depot/projects/soc2005/libalias/contrib/opensolaris/cmd/ztest/ztest.c#4 delete .. //depot/projects/soc2005/libalias/contrib/opensolaris/head/assert.h#2 delete .. //depot/projects/soc2005/libalias/contrib/opensolaris/head/atomic.h#2 delete .. //depot/projects/soc2005/libalias/contrib/opensolaris/head/libintl.h#2 delete .. //depot/projects/soc2005/libalias/contrib/opensolaris/head/stdio_ext.h#2 delete .. //depot/projects/soc2005/libalias/contrib/opensolaris/head/synch.h#2 delete .. //depot/projects/soc2005/libalias/contrib/opensolaris/head/thread.h#2 delete .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libnvpair/libnvpair.c#2 delete .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libnvpair/libnvpair.h#2 delete .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libnvpair/nvpair_alloc_system.c#2 delete .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libuutil/common/libuutil.h#2 delete .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#2 delete .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libuutil/common/libuutil_impl.h#2 delete .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#2 delete .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libuutil/common/uu_avl.c#2 delete .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c#2 delete .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libuutil/common/uu_ident.c#2 delete .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libuutil/common/uu_list.c#2 delete .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libuutil/common/uu_misc.c#2 delete .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libuutil/common/uu_open.c#2 delete .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libuutil/common/uu_pname.c#2 delete .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libuutil/common/uu_strtoint.c#2 delete .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libzfs/common/libzfs.h#4 delete .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#3 delete .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#3 delete .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#3 delete .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#2 delete .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#2 delete .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#4 delete .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#2 delete .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#2 delete .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#3 delete .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#3 delete .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libzpool/common/kernel.c#4 delete .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#7 delete .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libzpool/common/taskq.c#2 delete .. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libzpool/common/util.c#2 delete .. //depot/projects/soc2005/libalias/contrib/pf/pfctl/pfctl_altq.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/pf/pfctl/pfctl_qstats.c#2 integrate .. //depot/projects/soc2005/libalias/etc/network.subr#11 integrate .. //depot/projects/soc2005/libalias/etc/newsyslog.conf#2 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/ppp#6 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/gdb/kgdb/kld.c#2 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/gdb/kgdb/main.c#3 integrate .. //depot/projects/soc2005/libalias/include/stdio.h#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/gen/Makefile.inc#6 integrate .. //depot/projects/soc2005/libalias/lib/libc/gen/modf.3#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/gen/sysctl.3#5 integrate .. //depot/projects/soc2005/libalias/lib/libc/rpc/svc_vc.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/Makefile.inc#8 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/cpuset.2#1 branch .. //depot/projects/soc2005/libalias/lib/libc/sys/cpuset_getaffinity.2#1 branch .. //depot/projects/soc2005/libalias/lib/libc/sys/mincore.2#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/xdr/xdr_rec.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libthr/Makefile#8 integrate .. //depot/projects/soc2005/libalias/lib/msun/src/e_hypot.c#3 integrate .. //depot/projects/soc2005/libalias/lib/msun/src/e_hypotf.c#3 integrate .. //depot/projects/soc2005/libalias/lib/msun/src/e_log.c#5 integrate .. //depot/projects/soc2005/libalias/lib/msun/src/e_logf.c#4 integrate .. //depot/projects/soc2005/libalias/lib/msun/src/s_expm1.c#3 integrate .. //depot/projects/soc2005/libalias/lib/msun/src/s_expm1f.c#3 integrate .. //depot/projects/soc2005/libalias/lib/msun/src/s_fmaf.c#2 integrate .. //depot/projects/soc2005/libalias/lib/msun/src/s_log1p.c#3 integrate .. //depot/projects/soc2005/libalias/lib/msun/src/s_log1pf.c#3 integrate .. //depot/projects/soc2005/libalias/rescue/rescue/Makefile#8 integrate .. //depot/projects/soc2005/libalias/sbin/dhclient/dhclient-script#6 integrate .. //depot/projects/soc2005/libalias/sbin/ggate/Makefile#5 integrate .. //depot/projects/soc2005/libalias/share/man/man3/Makefile#6 integrate .. //depot/projects/soc2005/libalias/share/man/man4/arcmsr.4#3 integrate .. //depot/projects/soc2005/libalias/share/man/man4/ng_pptpgre.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/ubsa.4#5 integrate .. //depot/projects/soc2005/libalias/share/man/man5/rc.conf.5#17 integrate .. //depot/projects/soc2005/libalias/share/man/man5/src.conf.5#10 integrate .. //depot/projects/soc2005/libalias/share/man/man9/Makefile#16 integrate .. //depot/projects/soc2005/libalias/share/man/man9/lock.9#7 integrate .. //depot/projects/soc2005/libalias/share/mk/bsd.own.mk#11 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/pmap.c#18 integrate .. //depot/projects/soc2005/libalias/sys/amd64/conf/GENERIC#14 integrate .. //depot/projects/soc2005/libalias/sys/amd64/conf/NOTES#11 integrate .. //depot/projects/soc2005/libalias/sys/amd64/include/param.h#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/isa/clock.c#10 integrate .. //depot/projects/soc2005/libalias/sys/arm/conf/AVILA#9 integrate .. //depot/projects/soc2005/libalias/sys/arm/conf/BWCT#3 integrate .. //depot/projects/soc2005/libalias/sys/arm/conf/CRB#3 integrate .. //depot/projects/soc2005/libalias/sys/arm/conf/EP80219#6 integrate .. //depot/projects/soc2005/libalias/sys/arm/conf/HL200#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/conf/IQ31244#5 integrate .. //depot/projects/soc2005/libalias/sys/arm/conf/KB920X#7 integrate .. //depot/projects/soc2005/libalias/sys/arm/conf/SIMICS#5 integrate .. //depot/projects/soc2005/libalias/sys/arm/conf/SKYEYE#4 integrate .. //depot/projects/soc2005/libalias/sys/arm/include/param.h#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/forth/loader.conf#12 integrate .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/kern/opensolaris_kstat.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/kern/opensolaris_string.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/kern/opensolaris_zone.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/machine/endian.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/rpc/xdr.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/acl.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/atomic.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/bitmap.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/byteorder.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/callb.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/cmn_err.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/cpupart.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/cpuvar.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/cred.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/cyclic.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/debug.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/dirent.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/dkio.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/dnlc.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/elf.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/kcondvar.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/kmem.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/kobj.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/kstat.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/lock.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/misc.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/mman.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/mntent.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/mnttab.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/modctl.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/mount.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/mutex.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/objfs.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/param.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/pcpu.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/policy.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/proc.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/random.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/rwlock.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/sdt.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/stat.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/string.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/sunddi.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/sysmacros.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/systm.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/taskq.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/taskq_impl.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/time.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/types.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/uio.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/varargs.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/vfs.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/vnode.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/zone.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/common/atomic/i386/atomic.S#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/common/atomic/ia64/atomic.S#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/common/avl/avl.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/Makefile.files#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bplist.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/gzip.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sha256.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/unique.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/os/callb.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/os/list.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/os/taskq.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_array.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_mem.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/sys/asm_linkage.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/sys/avl_impl.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/sys/bitmap.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/sys/byteorder.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/sys/callb.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/sys/ccompile.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/sys/compress.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/sys/cred.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/sys/dkio.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/sys/dklabel.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/sys/errorq.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/sys/feature_tests.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/sys/fm/protocol.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/sys/fm/util.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/sys/gfs.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/sys/list.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/sys/list_impl.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/sys/note.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair_impl.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/sys/processor.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/sys/procset.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/sys/sdt.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/sys/synch.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/sys/vmem.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/sys/zmod.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/zmod/adler32.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/zmod/deflate.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/zmod/deflate.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/zmod/inffast.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/zmod/inffast.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/zmod/inffixed.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/zmod/inflate.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/zmod/inflate.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/zmod/inftrees.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/zmod/inftrees.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/zmod/trees.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/zmod/zconf.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/zmod/zlib.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod_subr.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/zmod/zutil.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/zmod/zutil.h#1 branch .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/kern/opensolaris_atomic.c#2 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/kern/opensolaris_kmem.c#4 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/kern/opensolaris_kobj.c#5 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/kern/opensolaris_kstat.c#3 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/kern/opensolaris_misc.c#3 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/kern/opensolaris_policy.c#3 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/kern/opensolaris_string.c#3 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/kern/opensolaris_vfs.c#6 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/kern/opensolaris_zone.c#2 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/machine/endian.h#2 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/rpc/xdr.h#3 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/acl.h#2 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/atomic.h#3 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/bitmap.h#2 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/byteorder.h#2 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/callb.h#2 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/cmn_err.h#2 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/cpupart.h#2 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/cpuvar.h#2 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/cred.h#2 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/cyclic.h#2 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/debug.h#2 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/dirent.h#2 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/dkio.h#2 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/dnlc.h#2 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/elf.h#2 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/kcondvar.h#3 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/kmem.h#4 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/kobj.h#3 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/kstat.h#2 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/lock.h#2 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/misc.h#3 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/mman.h#2 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/mntent.h#2 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/mnttab.h#2 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/modctl.h#2 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/mount.h#2 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/mutex.h#5 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/objfs.h#2 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/param.h#2 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/pcpu.h#2 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/policy.h#2 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/proc.h#4 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/random.h#2 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/rwlock.h#5 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/sdt.h#2 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/stat.h#2 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/string.h#3 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/sunddi.h#2 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/sysmacros.h#2 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/systm.h#2 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/taskq.h#2 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/taskq_impl.h#2 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/time.h#3 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/types.h#4 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/uio.h#2 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/varargs.h#2 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/vfs.h#3 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/vnode.h#5 delete .. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/zone.h#2 delete .. //depot/projects/soc2005/libalias/sys/conf/NOTES#31 integrate .. //depot/projects/soc2005/libalias/sys/conf/files#36 integrate .. //depot/projects/soc2005/libalias/sys/conf/options#28 integrate .. //depot/projects/soc2005/libalias/sys/conf/options.amd64#5 integrate .. //depot/projects/soc2005/libalias/sys/conf/options.i386#5 integrate .. //depot/projects/soc2005/libalias/sys/conf/options.pc98#4 integrate .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/OPENSOLARIS.LICENSE#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/common/acl/acl_common.c#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/common/acl/acl_common.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#4 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/common/atomic/i386/atomic.S#4 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/common/atomic/ia64/atomic.S#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/common/avl/avl.c#3 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/common/nvpair/nvpair.c#3 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/common/zfs/zfs_namecheck.c#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/common/zfs/zfs_namecheck.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/common/zfs/zfs_prop.c#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/common/zfs/zfs_prop.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/Makefile.files#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/gfs.c#4 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#6 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/bplist.c#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#4 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/dmu.c#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#3 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#3 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/dnode.c#3 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#3 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#4 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#3 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#3 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/gzip.c#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/refcount.c#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sha256.c#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#4 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#4 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#3 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/space_map.c#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#3 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#3 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#3 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#3 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#4 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#3 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/txg.c#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/unique.c#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#4 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#3 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#5 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#3 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#3 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c#4 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#3 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#3 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#5 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#3 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#4 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#5 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#3 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#4 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#7 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#8 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#6 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#4 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#5 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#4 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/os/callb.c#3 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/os/list.c#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/os/taskq.c#3 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/rpc/xdr.c#3 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/rpc/xdr.h#3 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/rpc/xdr_array.c#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/rpc/xdr_mem.c#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/sys/asm_linkage.h#3 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/sys/avl.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/sys/avl_impl.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/sys/bitmap.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/sys/byteorder.h#3 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/sys/callb.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/sys/ccompile.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/sys/compress.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/sys/cred.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/sys/debug.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/sys/dkio.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/sys/dklabel.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/sys/errorq.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/sys/feature_tests.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/sys/fm/protocol.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/sys/fm/util.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/sys/fs/zfs.h#3 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/sys/gfs.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#3 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/sys/list.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/sys/list_impl.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/sys/note.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/sys/nvpair.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/sys/nvpair_impl.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/sys/processor.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/sys/procset.h#3 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/sys/sdt.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/sys/synch.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/sys/sysevent.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#3 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/sys/vmem.h#3 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/sys/zmod.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/zmod/adler32.c#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/zmod/crc32.c#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/zmod/crc32.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/zmod/deflate.c#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/zmod/deflate.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/zmod/inffast.c#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/zmod/inffast.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/zmod/inffixed.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/zmod/inflate.c#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/zmod/inflate.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/zmod/inftrees.c#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/zmod/inftrees.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/zmod/trees.c#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/zmod/zconf.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/zmod/zlib.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/zmod/zmod.c#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/zmod/zmod_subr.c#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/zmod/zutil.c#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/zmod/zutil.h#2 delete .. //depot/projects/soc2005/libalias/sys/contrib/pf/net/pf_if.c#4 integrate .. //depot/projects/soc2005/libalias/sys/contrib/pf/net/pf_ioctl.c#7 integrate .. //depot/projects/soc2005/libalias/sys/contrib/pf/net/pfvar.h#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/aac/aac.c#8 integrate .. //depot/projects/soc2005/libalias/sys/dev/re/if_re.c#17 integrate .. //depot/projects/soc2005/libalias/sys/dev/speaker/spkr.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/ubsa.c#9 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/usbdevs#17 integrate .. //depot/projects/soc2005/libalias/sys/fs/nullfs/null_subr.c#5 integrate .. //depot/projects/soc2005/libalias/sys/geom/geom_subr.c#5 integrate .. //depot/projects/soc2005/libalias/sys/geom/part/g_part.h#6 integrate .. //depot/projects/soc2005/libalias/sys/geom/part/g_part_pc98.c#1 branch .. //depot/projects/soc2005/libalias/sys/gnu/fs/ext2fs/ext2_vfsops.c#8 integrate .. //depot/projects/soc2005/libalias/sys/i386/conf/GENERIC#13 integrate .. //depot/projects/soc2005/libalias/sys/i386/conf/NOTES#13 integrate .. //depot/projects/soc2005/libalias/sys/i386/conf/XBOX#5 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/busdma_machdep.c#10 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/pmap.c#14 integrate .. //depot/projects/soc2005/libalias/sys/i386/include/param.h#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/include/pmap.h#7 integrate .. //depot/projects/soc2005/libalias/sys/i386/isa/clock.c#11 integrate .. //depot/projects/soc2005/libalias/sys/ia64/conf/GENERIC#11 integrate .. //depot/projects/soc2005/libalias/sys/ia64/include/param.h#2 integrate .. //depot/projects/soc2005/libalias/sys/isa/syscons_isa.c#4 integrate .. //depot/projects/soc2005/libalias/sys/kern/init_sysent.c#17 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_cpuset.c#5 integrate .. //depot/projects/soc2005/libalias/sys/kern/makesyscalls.sh#7 integrate .. //depot/projects/soc2005/libalias/sys/kern/syscalls.c#17 integrate .. //depot/projects/soc2005/libalias/sys/kern/systrace_args.c#14 integrate .. //depot/projects/soc2005/libalias/sys/kern/uipc_mqueue.c#9 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_bio.c#15 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_subr.c#19 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_vnops.c#9 integrate .. //depot/projects/soc2005/libalias/sys/modules/Makefile#22 integrate .. //depot/projects/soc2005/libalias/sys/modules/bktr/bktr/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/modules/em/Makefile#4 integrate .. //depot/projects/soc2005/libalias/sys/modules/geom/geom_part/Makefile#3 integrate .. //depot/projects/soc2005/libalias/sys/modules/geom/geom_part/geom_part_pc98/Makefile#1 branch .. //depot/projects/soc2005/libalias/sys/modules/igb/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/modules/ixgbe/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/modules/krpc/Makefile#1 branch .. //depot/projects/soc2005/libalias/sys/modules/nfslockd/Makefile#1 branch .. //depot/projects/soc2005/libalias/sys/modules/sound/driver/emu10kx/Makefile#5 integrate .. //depot/projects/soc2005/libalias/sys/modules/uslcom/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/modules/wpi/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/modules/zfs/Makefile#7 integrate .. //depot/projects/soc2005/libalias/sys/net/bpf_zerocopy.c#2 integrate .. //depot/projects/soc2005/libalias/sys/net/if.h#6 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/ng_base.c#10 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/ng_car.c#4 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/ng_pptpgre.c#4 integrate .. //depot/projects/soc2005/libalias/sys/netncp/ncp_conn.c#5 integrate .. //depot/projects/soc2005/libalias/sys/netsmb/smb_iod.c#6 integrate .. //depot/projects/soc2005/libalias/sys/nlm/nlm_prot_clnt.c#2 integrate .. //depot/projects/soc2005/libalias/sys/nlm/nlm_prot_impl.c#2 integrate .. //depot/projects/soc2005/libalias/sys/nlm/nlm_prot_server.c#2 integrate .. //depot/projects/soc2005/libalias/sys/nlm/nlm_prot_svc.c#2 integrate .. //depot/projects/soc2005/libalias/sys/nlm/nlm_prot_xdr.c#2 integrate .. //depot/projects/soc2005/libalias/sys/nlm/sm_inter_xdr.c#2 integrate .. //depot/projects/soc2005/libalias/sys/pc98/cbus/clock.c#8 integrate .. //depot/projects/soc2005/libalias/sys/pc98/cbus/syscons_cbus.c#4 integrate .. //depot/projects/soc2005/libalias/sys/pc98/conf/GENERIC#12 integrate .. //depot/projects/soc2005/libalias/sys/pc98/conf/NOTES#6 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/conf/GENERIC#14 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/include/param.h#2 integrate .. //depot/projects/soc2005/libalias/sys/rpc/auth_unix.c#2 integrate .. //depot/projects/soc2005/libalias/sys/rpc/authunix_prot.c#2 integrate .. //depot/projects/soc2005/libalias/sys/rpc/clnt_dg.c#2 integrate .. //depot/projects/soc2005/libalias/sys/rpc/clnt_rc.c#2 integrate .. //depot/projects/soc2005/libalias/sys/rpc/clnt_vc.c#2 integrate .. //depot/projects/soc2005/libalias/sys/rpc/inet_ntop.c#2 integrate .. //depot/projects/soc2005/libalias/sys/rpc/inet_pton.c#2 integrate .. //depot/projects/soc2005/libalias/sys/rpc/rpc_generic.c#2 integrate .. //depot/projects/soc2005/libalias/sys/rpc/rpcb_clnt.c#2 integrate .. //depot/projects/soc2005/libalias/sys/rpc/svc.c#2 integrate .. //depot/projects/soc2005/libalias/sys/rpc/svc_auth_unix.c#2 integrate .. //depot/projects/soc2005/libalias/sys/rpc/svc_dg.c#2 integrate .. //depot/projects/soc2005/libalias/sys/rpc/svc_generic.c#2 integrate .. //depot/projects/soc2005/libalias/sys/rpc/svc_vc.c#2 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/conf/GENERIC#12 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/include/param.h#3 integrate .. //depot/projects/soc2005/libalias/sys/sun4v/conf/GENERIC#10 integrate .. //depot/projects/soc2005/libalias/sys/sun4v/include/param.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/aac_ioctl.h#3 integrate .. //depot/projects/soc2005/libalias/sys/sys/buf.h#8 integrate .. //depot/projects/soc2005/libalias/sys/sys/cpuset.h#4 integrate .. //depot/projects/soc2005/libalias/sys/sys/lockmgr.h#8 integrate .. //depot/projects/soc2005/libalias/sys/sys/mman.h#3 integrate .. //depot/projects/soc2005/libalias/sys/sys/param.h#23 integrate .. //depot/projects/soc2005/libalias/sys/sys/syscall.h#17 integrate .. //depot/projects/soc2005/libalias/sys/sys/syscall.mk#17 integrate .. //depot/projects/soc2005/libalias/sys/sys/sysproto.h#17 integrate .. //depot/projects/soc2005/libalias/sys/ufs/ffs/ffs_vfsops.c#14 integrate .. //depot/projects/soc2005/libalias/sys/vm/vm_object.c#13 integrate .. //depot/projects/soc2005/libalias/tools/build/mk/OptionalObsoleteFiles.inc#12 integrate .. //depot/projects/soc2005/libalias/tools/build/options/WITHOUT_LIBKSE#2 delete .. //depot/projects/soc2005/libalias/usr.bin/Makefile#9 integrate .. //depot/projects/soc2005/libalias/usr.bin/awk/Makefile#6 integrate .. //depot/projects/soc2005/libalias/usr.bin/fstat/zfs/Makefile#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/Makefile#15 integrate .. //depot/projects/soc2005/libalias/usr.sbin/amd/amd/Makefile#3 integrate .. //depot/projects/soc2005/libalias/usr.sbin/clear_locks/Makefile#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/ngctl/Makefile#6 integrate .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/add/perform.c#3 integrate .. //depot/projects/soc2005/libalias/usr.sbin/rpc.lockd/lockd.c#7 integrate .. //depot/projects/soc2005/libalias/usr.sbin/rpc.lockd/rpc.lockd.8#5 integrate Differences ... ==== //depot/projects/soc2005/libalias/Makefile.inc1#17 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.601 2008/03/02 11:10:46 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.602 2008/03/29 17:44:38 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -1039,18 +1039,14 @@ ${_lib_libgssapi} ${_lib_libipx} \ lib/libkiconv lib/libkvm lib/libmd \ lib/ncurses/ncurses lib/ncurses/ncursesw \ - lib/libopie lib/libpam ${_default_thread_lib} \ + lib/libopie lib/libpam ${_lib_libthr} \ lib/libradius lib/libsbuf lib/libtacplus lib/libutil \ ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ ${_secure_lib_libssl} -.if ${MK_LIBTHR} != "no" && ${MK_LIBKSE} != "no" -_default_thread_lib= lib/${DEFAULT_THREAD_LIB} -.elif ${MK_LIBTHR} != "no" -_default_thread_lib= lib/libthr -.elif ${MK_LIBKSE} != "no" -_default_thread_lib= lib/libkse +.if ${MK_LIBTHR} != "no" +_lib_libthr= lib/libthr .endif _generic_libs= ${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib ==== //depot/projects/soc2005/libalias/ObsoleteFiles.inc#28 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.134 2008/03/26 06:45:28 remko Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.135 2008/03/29 17:44:38 ru Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -30,7 +30,6 @@ # 20071201: Removal of XRPU driver OLD_FILES+=usr/include/sys/xrpuio.h # 20071129: Disabled static versions of libkse by default -.if ${DEFAULT_THREAD_LIB} != "libkse" && ${MK_LIBTHR} != "no" OLD_FILES+=usr/lib/libkse.a OLD_FILES+=usr/lib/libkse_p.a OLD_FILES+=usr/lib/libkse_pic.a @@ -39,7 +38,6 @@ OLD_FILES+=usr/lib32/libkse_p.a OLD_FILES+=usr/lib32/libkse_pic.a .endif -.endif # 20071129: Removed a Solaris compatibility header OLD_FILES+=usr/include/sys/_elf_solaris.h # 20071125: Renamed to pmc_get_msr() ==== //depot/projects/soc2005/libalias/cddl/Makefile.inc#4 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/cddl/Makefile.inc,v 1.3 2007/11/28 22:58:09 jb Exp $ +# $FreeBSD: src/cddl/Makefile.inc,v 1.4 2008/03/27 23:21:23 jb Exp $ -OPENSOLARIS_USR_DISTDIR= ${.CURDIR}/../../../contrib/opensolaris -OPENSOLARIS_SYS_DISTDIR= ${.CURDIR}/../../../sys/contrib/opensolaris +OPENSOLARIS_USR_DISTDIR= ${.CURDIR}/../../../cddl/contrib/opensolaris +OPENSOLARIS_SYS_DISTDIR= ${.CURDIR}/../../../sys/cddl/contrib/opensolaris IGNORE_PRAGMA= YES ==== //depot/projects/soc2005/libalias/cddl/lib/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/cddl/lib/Makefile,v 1.7 2007/10/09 23:31:09 obrien Exp $ +# $FreeBSD: src/cddl/lib/Makefile,v 1.8 2008/03/29 17:44:40 ru Exp $ .include @@ -11,7 +11,7 @@ .if ${MK_ZFS} != "no" _libzfs= libzfs -.if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no" +.if ${MK_LIBTHR} != "no" _libzpool= libzpool .endif .endif ==== //depot/projects/soc2005/libalias/cddl/lib/libavl/Makefile#3 (text+ko) ==== @@ -1,10 +1,10 @@ -# $FreeBSD: src/cddl/lib/libavl/Makefile,v 1.2 2007/04/16 21:20:24 ru Exp $ +# $FreeBSD: src/cddl/lib/libavl/Makefile,v 1.3 2008/03/27 23:21:23 jb Exp $ -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/avl +.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/avl LIB= avl SRCS= avl.c -CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common .include ==== //depot/projects/soc2005/libalias/cddl/lib/libnvpair/Makefile#4 (text+ko) ==== @@ -1,7 +1,7 @@ -# $FreeBSD: src/cddl/lib/libnvpair/Makefile,v 1.3 2007/11/28 22:58:09 jb Exp $ +# $FreeBSD: src/cddl/lib/libnvpair/Makefile,v 1.4 2008/03/27 23:21:23 jb Exp $ -.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/nvpair +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair +.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/nvpair LIB= nvpair @@ -10,8 +10,8 @@ nvpair_alloc_fixed.c \ nvpair.c -CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include -CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include +CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common .include ==== //depot/projects/soc2005/libalias/cddl/lib/libumem/Makefile#3 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/cddl/lib/libumem/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $ +# $FreeBSD: src/cddl/lib/libumem/Makefile,v 1.3 2008/03/27 23:21:23 jb Exp $ -.PATH: ${.CURDIR}/../../../compat/opensolaris/lib/libumem +.PATH: ${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem LIB= umem SRCS= umem.c -CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem +CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem .include ==== //depot/projects/soc2005/libalias/cddl/lib/libuutil/Makefile#3 (text+ko) ==== @@ -1,7 +1,7 @@ -# $FreeBSD: src/cddl/lib/libuutil/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $ +# $FreeBSD: src/cddl/lib/libuutil/Makefile,v 1.3 2008/03/27 23:21:24 jb Exp $ -.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/avl +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common +.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/avl LIB= uutil SRCS= avl.c \ @@ -16,10 +16,10 @@ uu_strtoint.c >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Mar 30 19:46:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C9EF51065672; Sun, 30 Mar 2008 19:46:25 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6FB95106566C for ; Sun, 30 Mar 2008 19:46:25 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 517258FC1D for ; Sun, 30 Mar 2008 19:46:25 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2UJkP6u012411 for ; Sun, 30 Mar 2008 19:46:25 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2UJkPJ8012409 for perforce@freebsd.org; Sun, 30 Mar 2008 19:46:25 GMT (envelope-from sam@freebsd.org) Date: Sun, 30 Mar 2008 19:46:25 GMT Message-Id: <200803301946.m2UJkPJ8012409@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 139003 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Mar 2008 19:46:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=139003 Change 139003 by sam@sam_ebb on 2008/03/30 19:46:12 push clone create operation on seeing the first non-clone-related cmd line argument; this fixes doing stuff like: ifconfig lo1 create inet 5.5.5.5 netmask 255.255.255.0 Inspired by: Eugene Grosbein Affected files ... .. //depot/projects/vap/sbin/ifconfig/ifconfig.c#6 edit .. //depot/projects/vap/sbin/ifconfig/ifconfig.h#5 edit .. //depot/projects/vap/sbin/ifconfig/ifieee80211.c#16 edit .. //depot/projects/vap/sbin/ifconfig/ifvlan.c#5 edit Differences ... ==== //depot/projects/vap/sbin/ifconfig/ifconfig.c#6 (text+ko) ==== @@ -93,7 +93,8 @@ int supmedia = 0; int printkeys = 0; /* Print keying material for interfaces. */ -static int ifconfig(int argc, char *const *argv, const struct afswtch *afp); +static int ifconfig(int argc, char *const *argv, int iscreate, + const struct afswtch *afp); static void status(const struct afswtch *afp, const struct sockaddr_dl *sdl, struct ifaddrs *ifa); static void tunnel_status(int s); @@ -247,7 +248,7 @@ if (iflen >= sizeof(name)) errx(1, "%s: cloning name too long", ifname); - ifconfig(argc, argv, NULL); + ifconfig(argc, argv, 1, NULL); exit(0); } errx(1, "interface %s does not exist", ifname); @@ -305,7 +306,7 @@ } if (argc > 0) - ifconfig(argc, argv, afp); + ifconfig(argc, argv, 0, afp); else status(afp, sdl, ifa); } @@ -433,17 +434,19 @@ DEF_CMD("ifdstaddr", 0, setifdstaddr); static int -ifconfig(int argc, char *const *argv, const struct afswtch *afp) +ifconfig(int argc, char *const *argv, int iscreate, const struct afswtch *afp) { + const struct afswtch *nafp; struct callback *cb; int s; + strncpy(ifr.ifr_name, name, sizeof ifr.ifr_name); +top: if (afp == NULL) afp = af_getbyname("inet"); ifr.ifr_addr.sa_family = afp->af_af == AF_LINK || afp->af_af == AF_UNSPEC ? AF_INET : afp->af_af; - strncpy(ifr.ifr_name, name, sizeof ifr.ifr_name); if ((s = socket(ifr.ifr_addr.sa_family, SOCK_DGRAM, 0)) < 0) err(1, "socket(family %u,SOCK_DGRAM", ifr.ifr_addr.sa_family); @@ -460,6 +463,33 @@ p = (setaddr ? &setifdstaddr_cmd : &setifaddr_cmd); } if (p->c_u.c_func || p->c_u.c_func2) { + if (iscreate && !p->c_iscloneop) { + /* + * Push the clone create callback so the new + * device is created and can be used for any + * remaining arguments. + */ + cb = callbacks; + if (cb == NULL) + errx(1, "internal error, no callback"); + callbacks = cb->cb_next; + cb->cb_func(s, cb->cb_arg); + iscreate = 0; + /* + * Handle any address family spec that + * immediately follows and potentially + * recreate the socket. + */ + nafp = af_getbyname(*argv); + if (nafp != NULL) { + argc--, argv++; + if (nafp != afp) { + close(s); + afp = nafp; + goto top; + } + } + } if (p->c_parameter == NEXTARG) { if (argv[1] == NULL) errx(1, "'%s' requires argument", ==== //depot/projects/vap/sbin/ifconfig/ifconfig.h#5 (text+ko) ==== @@ -52,6 +52,7 @@ c_func *c_func; c_func2 *c_func2; } c_u; + int c_iscloneop; struct cmd *c_next; }; void cmd_register(struct cmd *); @@ -71,6 +72,8 @@ #define DEF_CMD_ARG(name, func) { name, NEXTARG, { .c_func = func } } #define DEF_CMD_OPTARG(name, func) { name, OPTARG, { .c_func = func } } #define DEF_CMD_ARG2(name, func) { name, NEXTARG2, { .c_func2 = func } } +#define DEF_CLONE_CMD(name, param, func) { name, param, { .c_func = func }, 1 } +#define DEF_CLONE_CMD_ARG(name, func) { name, NEXTARG, { .c_func = func }, 1 } struct ifaddrs; struct addrinfo; ==== //depot/projects/vap/sbin/ifconfig/ifieee80211.c#16 (text+ko) ==== @@ -4473,15 +4473,15 @@ DEF_CMD_ARG("chanswitch", set80211chanswitch), /* vap cloning support */ - DEF_CMD_ARG("wlanbssid", set80211clone_wlanbssid), - DEF_CMD_ARG("wlandev", set80211clone_wlandev), - DEF_CMD_ARG("wlanmode", set80211clone_wlanmode), - DEF_CMD("beacons", 1, set80211clone_beacons), - DEF_CMD("-beacons", 0, set80211clone_beacons), - DEF_CMD("bssid", 1, set80211clone_bssid), - DEF_CMD("-bssid", 0, set80211clone_bssid), - DEF_CMD("wdslegacy", 1, set80211clone_wdslegacy), - DEF_CMD("-wdslegacy", 0, set80211clone_wdslegacy), + DEF_CLONE_CMD_ARG("wlanbssid", set80211clone_wlanbssid), + DEF_CLONE_CMD_ARG("wlandev", set80211clone_wlandev), + DEF_CLONE_CMD_ARG("wlanmode", set80211clone_wlanmode), + DEF_CLONE_CMD("beacons", 1, set80211clone_beacons), + DEF_CLONE_CMD("-beacons", 0, set80211clone_beacons), + DEF_CLONE_CMD("bssid", 1, set80211clone_bssid), + DEF_CLONE_CMD("-bssid", 0, set80211clone_bssid), + DEF_CLONE_CMD("wdslegacy", 1, set80211clone_wdslegacy), + DEF_CLONE_CMD("-wdslegacy", 0, set80211clone_wdslegacy), }; static struct afswtch af_ieee80211 = { .af_name = "af_ieee80211", ==== //depot/projects/vap/sbin/ifconfig/ifvlan.c#5 (text+ko) ==== @@ -172,8 +172,8 @@ } static struct cmd vlan_cmds[] = { - DEF_CMD_ARG("vlan", setvlantag), - DEF_CMD_ARG("vlandev", setvlandev), + DEF_CLONE_CMD_ARG("vlan", setvlantag), + DEF_CLONE_CMD_ARG("vlandev", setvlandev), /* XXX For compatibility. Should become DEF_CMD() some day. */ DEF_CMD_OPTARG("-vlandev", unsetvlandev), DEF_CMD("vlanmtu", IFCAP_VLAN_MTU, setifcap), From owner-p4-projects@FreeBSD.ORG Sun Mar 30 19:58:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 277D21065671; Sun, 30 Mar 2008 19:58:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D64C0106566B for ; Sun, 30 Mar 2008 19:58:37 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B82128FC1D for ; Sun, 30 Mar 2008 19:58:37 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2UJwbU1012744 for ; Sun, 30 Mar 2008 19:58:37 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2UJwbCX012742 for perforce@freebsd.org; Sun, 30 Mar 2008 19:58:37 GMT (envelope-from sam@freebsd.org) Date: Sun, 30 Mar 2008 19:58:37 GMT Message-Id: <200803301958.m2UJwbCX012742@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 139004 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Mar 2008 19:58:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=139004 Change 139004 by sam@sam_ebb on 2008/03/30 19:58:18 must mark clone/plumb cmds as clone parameter so we don't push the clone request callback too soon Affected files ... .. //depot/projects/vap/sbin/ifconfig/ifclone.c#5 edit Differences ... ==== //depot/projects/vap/sbin/ifconfig/ifclone.c#5 (text+ko) ==== @@ -143,9 +143,9 @@ } static struct cmd clone_cmds[] = { - DEF_CMD("create", 0, clone_create), + DEF_CLONE_CMD("create", 0, clone_create), DEF_CMD("destroy", 0, clone_destroy), - DEF_CMD("plumb", 0, clone_create), + DEF_CLONE_CMD("plumb", 0, clone_create), DEF_CMD("unplumb", 0, clone_destroy), }; From owner-p4-projects@FreeBSD.ORG Mon Mar 31 03:25:41 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 29ED11065673; Mon, 31 Mar 2008 03:25:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D2BE8106564A for ; Mon, 31 Mar 2008 03:25:40 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B74748FC14 for ; Mon, 31 Mar 2008 03:25:40 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2V3PecA055237 for ; Mon, 31 Mar 2008 03:25:40 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2V3PevG055235 for perforce@freebsd.org; Mon, 31 Mar 2008 03:25:40 GMT (envelope-from sam@freebsd.org) Date: Mon, 31 Mar 2008 03:25:40 GMT Message-Id: <200803310325.m2V3PevG055235@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 139019 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 Mar 2008 03:25:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=139019 Change 139019 by sam@sam_ebb on 2008/03/31 03:25:22 don't mark the interface up when setting up the 802.1x state, add a commit method that gets called last in the setup work so all state changes are done w/ the interface down; this eliminates the unnecessary churn in the net80211 state machine when setting the WPA ie while here change bsd_set_iface_flags to take flags instead of 1/0 that gets translated to massaging of IFF_UP Affected files ... .. //depot/projects/vap/usr.sbin/wpa/hostapd/driver_freebsd.c#5 edit Differences ... ==== //depot/projects/vap/usr.sbin/wpa/hostapd/driver_freebsd.c#5 (text+ko) ==== @@ -123,14 +123,13 @@ } static int -bsd_set_iface_flags(void *priv, int dev_up) +bsd_set_iface_flags(void *priv, int flags) { struct bsd_driver_data *drv = priv; struct hostapd_data *hapd = drv->hapd; struct ifreq ifr; - HOSTAPD_DEBUG(HOSTAPD_DEBUG_VERBOSE, - "%s: dev_up=%d\n", __func__, dev_up); + HOSTAPD_DEBUG(HOSTAPD_DEBUG_VERBOSE, "%s: flags=0x%x\n", __func__, flags); if (drv->ioctl_sock < 0) return -1; @@ -143,17 +142,23 @@ return -1; } - if (dev_up) - ifr.ifr_flags |= IFF_UP; - else - ifr.ifr_flags &= ~IFF_UP; + if (flags < 0) { + flags = -flags; + if ((ifr.ifr_flags & flags) == 0) + return 0; + ifr.ifr_flags &= ~flags; + } else { + if ((ifr.ifr_flags & flags) == flags) + return 0; + ifr.ifr_flags |= flags; + } if (ioctl(drv->ioctl_sock, SIOCSIFFLAGS, &ifr) != 0) { perror("ioctl[SIOCSIFFLAGS]"); return -1; } - if (dev_up) { + if (flags > 0) { memset(&ifr, 0, sizeof(ifr)); snprintf(ifr.ifr_name, IFNAMSIZ, "%s", drv->iface); ifr.ifr_mtu = HOSTAPD_MTU; @@ -168,6 +173,12 @@ } static int +bsd_commit(void *priv) +{ + return bsd_set_iface_flags(priv, IFF_UP); +} + +static int bsd_set_ieee8021x(const char *ifname, void *priv, int enabled) { struct bsd_driver_data *drv = priv; @@ -198,7 +209,7 @@ HOSTAPD_LEVEL_WARNING, "Error enabling WPA/802.1X!"); return -1; } - return bsd_set_iface_flags(priv, 1); + return 0; } static int @@ -859,7 +870,7 @@ if (l2_packet_get_own_addr(drv->sock_xmit, hapd->own_addr)) goto bad; - bsd_set_iface_flags(drv, 0); /* mark down during setup */ + bsd_set_iface_flags(drv, -IFF_UP); /* mark down during setup */ hapd->driver = &drv->ops; return 0; @@ -882,7 +893,7 @@ drv->hapd->driver = NULL; - (void) bsd_set_iface_flags(drv, 0); + (void) bsd_set_iface_flags(drv, -IFF_UP); if (drv->ioctl_sock >= 0) close(drv->ioctl_sock); if (drv->sock_xmit != NULL) @@ -911,6 +922,7 @@ .get_ssid = bsd_get_ssid, .set_countermeasures = bsd_set_countermeasures, .sta_clear_stats = bsd_sta_clear_stats, + .commit = bsd_commit, #ifdef CONFIG_DRIVER_RADIUS_ACL .set_radius_acl_auth = bsd_set_radius_acl_auth, .set_radius_acl_expire = bsd_set_radius_acl_expire, From owner-p4-projects@FreeBSD.ORG Mon Mar 31 06:23:10 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A07961065674; Mon, 31 Mar 2008 06:23:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5BF5D106564A for ; Mon, 31 Mar 2008 06:23:10 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 54CD38FC1D for ; Mon, 31 Mar 2008 06:23:10 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2V6NA2j074134 for ; Mon, 31 Mar 2008 06:23:10 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2V6N3Ns074130 for perforce@freebsd.org; Mon, 31 Mar 2008 06:23:03 GMT (envelope-from scottl@freebsd.org) Date: Mon, 31 Mar 2008 06:23:03 GMT Message-Id: <200803310623.m2V6N3Ns074130@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 139026 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 Mar 2008 06:23:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=139026 Change 139026 by scottl@scottl-deimos on 2008/03/31 06:22:16 IFC, with the exception of cam_xpt.c. It'll need special f-ing handling because of all of the new conflicts with CVS. Affected files ... .. //depot/projects/scottl-camlock/src/sys/Makefile#13 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/acpica/acpi_machdep.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/acpica/madt.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/amd64_mem.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/busdma_machdep.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/cpu_switch.S#8 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/db_trace.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/dump_machdep.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/exception.S#7 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/genassym.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/identcpu.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/intr_machdep.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/legacy.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/local_apic.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/machdep.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/mem.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/minidump_machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/mp_machdep.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/mp_watchdog.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/mptable.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/msi.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/nexus.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/pmap.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/prof_machdep.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/stack_machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/support.S#10 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/trap.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/uma_machdep.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/vm_machdep.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/conf/DEFAULTS#7 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/conf/GENERIC#18 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/conf/GENERIC.hints#4 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/conf/NOTES#14 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/ia32/ia32_signal.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/_types.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/asm.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/asmacros.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/atomic.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/clock.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/float.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/ieeefp.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/intr_machdep.h#13 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/legacyvar.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/nexusvar.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/param.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/pc/bios.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/pcb.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/pci_cfgreg.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/pmap.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/pmc_mdep.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/proc.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/smp.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/specialreg.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/stack.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/timerreg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/vmparam.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/isa/atpic.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/isa/clock.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_machdep.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_proto.h#14 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_syscall.h#14 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_sysent.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_sysvec.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/syscalls.master#14 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/pci/pci_bus.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/pci/pci_cfgreg.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/bcopy_page.S#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/bcopyinout.S#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/busdma_machdep.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/cpufunc.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/cpufunc_asm_arm11.S#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/cpufunc_asm_armv5.S#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/cpufunc_asm_armv5_ec.S#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/cpufunc_asm_xscale_c3.S#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/db_trace.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/dump_machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/elf_trampoline.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/genassym.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/identcpu.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/in_cksum_arm.S#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/intr.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/locore.S#7 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/machdep.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/nexus.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/nexus_io.c#5 delete .. //depot/projects/scottl-camlock/src/sys/arm/arm/nexus_io_asm.S#3 delete .. //depot/projects/scottl-camlock/src/sys/arm/arm/pmap.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/stack_machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/support.S#6 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/swtch.S#6 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/trap.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/uio_machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/vm_machdep.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_mci.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_mcireg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_pmc.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91rm92reg.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/if_ate.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/kb920x_machdep.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/ohci_atmelarm.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/std.at91#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/std.kb920x#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/uart_dev_at91usart.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/AVILA#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/AVILA.hints#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/BWCT#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/CRB#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/conf/EP80219#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/HL200#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/conf/IQ31244#8 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/KB920X#8 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/SIMICS#8 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/SKYEYE#6 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/_bus.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/armreg.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/asm.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/asmacros.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/atomic.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/cpuconf.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/cpufunc.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/endian.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/param.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/pmap.h#15 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/pmc_mdep.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/pte.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/stack.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/sysarch.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/vmparam.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/assabet_machdep.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/files.sa11x0#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/uart_dev_sa1110.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/ep80219_machdep.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/i80321.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/i80321_pci.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/i80321_timer.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/i80321_wdog.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/i80321var.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/iq31244_machdep.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/obio.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i8134x/crb_machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i8134x/files.crb#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i8134x/files.i81342#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i8134x/i81342.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i8134x/i81342_mcu.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i8134x/i81342_pci.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i8134x/i81342_space.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i8134x/i81342reg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i8134x/i81342var.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i8134x/iq81342_7seg.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i8134x/iq81342reg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i8134x/iq81342var.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i8134x/obio.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i8134x/obio_space.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i8134x/obiovar.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i8134x/std.crb#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i8134x/std.i81342#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i8134x/uart_bus_i81342.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i8134x/uart_cpu_i81342.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/avila_machdep.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/files.ixp425#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/if_npe.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/ixdp425_pci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/ixp425.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/ixp425_iic.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/ixp425_npe.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/ixp425_npevar.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/ixp425_pci.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/ixp425_qmgr.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/boot/Makefile#10 integrate .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/Makefile.inc#6 integrate .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/boot2/board.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/boot2/boot2.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/boot2/bwct_board.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/boot2/centipad_board.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/boot2/kb920x_board.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/Makefile#6 integrate .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/eeprom.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/emac.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/emac.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/emac_init.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/lib.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/boot/arm/at91/libat91/spi_flash.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/boot/common/bootstrap.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/boot/common/dev_net.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/boot/common/load_elf.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/boot/common/loader.8#13 integrate .. //depot/projects/scottl-camlock/src/sys/boot/common/module.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/boot/common/ufsread.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/boot/ficl/Makefile#6 integrate .. //depot/projects/scottl-camlock/src/sys/boot/forth/loader.conf#14 integrate .. //depot/projects/scottl-camlock/src/sys/boot/forth/loader.conf.5#6 integrate .. //depot/projects/scottl-camlock/src/sys/boot/forth/support.4th#3 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/boot2/boot2.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/btx/btx/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/btx/btx/btx.S#6 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/cdboot/cdboot.s#5 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/gptboot/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/gptboot/gptboot.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/gptboot/gptldr.S#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/Makefile#6 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/bioscd.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/biosdisk.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/biosmem.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/biossmap.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/devicename.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/pxe.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/loader/main.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/pmbr/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/pmbr/pmbr.s#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/pxeldr/pxeldr.S#5 integrate .. //depot/projects/scottl-camlock/src/sys/boot/ofw/libofw/ofw_console.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/Makefile.inc#3 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/boot.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/btx/btx/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/btx/btx/btx.S#6 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/cdboot/cdboot.s#3 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/libpc98/Makefile#6 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/libpc98/bioscd.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/libpc98/biosdisk.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/loader/main.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/boot/powerpc/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/powerpc/loader/Makefile#5 delete .. //depot/projects/scottl-camlock/src/sys/boot/powerpc/loader/conf.c#3 delete .. //depot/projects/scottl-camlock/src/sys/boot/powerpc/loader/help.ofw#2 delete .. //depot/projects/scottl-camlock/src/sys/boot/powerpc/loader/ldscript.powerpc#2 delete .. //depot/projects/scottl-camlock/src/sys/boot/powerpc/loader/metadata.c#4 delete .. //depot/projects/scottl-camlock/src/sys/boot/powerpc/loader/start.c#4 delete .. //depot/projects/scottl-camlock/src/sys/boot/powerpc/loader/version#2 delete .. //depot/projects/scottl-camlock/src/sys/boot/powerpc/ofw/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/powerpc/ofw/conf.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/powerpc/ofw/help.ofw#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/powerpc/ofw/ldscript.powerpc#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/powerpc/ofw/metadata.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/powerpc/ofw/start.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/powerpc/ofw/version#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/powerpc/uboot/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/powerpc/uboot/conf.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/powerpc/uboot/help.uboot#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/powerpc/uboot/ldscript.powerpc#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/powerpc/uboot/metadata.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/powerpc/uboot/start.S#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/powerpc/uboot/version#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/uboot/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/uboot/common/Makefile.inc#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/uboot/common/main.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/uboot/lib/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/uboot/lib/api_public.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/uboot/lib/console.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/uboot/lib/copy.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/uboot/lib/devicename.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/uboot/lib/disk.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/uboot/lib/elf_freebsd.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/uboot/lib/glue.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/uboot/lib/glue.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/uboot/lib/libuboot.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/uboot/lib/module.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/uboot/lib/net.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/uboot/lib/reboot.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/uboot/lib/time.c#1 branch .. //depot/projects/scottl-camlock/src/sys/bsm/audit.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/bsm/audit_internal.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/bsm/audit_kevents.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/bsm/audit_record.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_all.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#37 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_low.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ses.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/kern/opensolaris_kstat.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/kern/opensolaris_string.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/kern/opensolaris_zone.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/machine/endian.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/rpc/xdr.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/acl.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/atomic.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/bitmap.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/byteorder.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/callb.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/cmn_err.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/cpupart.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/cpuvar.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/cred.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/cyclic.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/debug.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/dirent.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/dkio.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/dnlc.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/elf.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/kcondvar.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/kmem.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/kobj.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/kstat.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/lock.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/misc.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/mman.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/mntent.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/mnttab.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/modctl.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/mount.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/mutex.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/objfs.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/param.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/pcpu.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/policy.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/proc.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/random.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/rwlock.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/sdt.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/stat.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/string.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/sunddi.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/sysmacros.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/systm.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/taskq.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/taskq_impl.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/time.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/types.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/uio.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/varargs.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/vfs.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/vnode.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/zone.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/common/atomic/i386/atomic.S#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/common/atomic/ia64/atomic.S#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/common/avl/avl.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/Makefile.files#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bplist.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/gzip.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sha256.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/unique.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/os/callb.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/os/list.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/os/taskq.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_array.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_mem.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/asm_linkage.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/avl_impl.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/bitmap.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/byteorder.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/callb.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/ccompile.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/compress.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/cred.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/dkio.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/dklabel.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/errorq.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/feature_tests.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/fm/protocol.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/fm/util.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/gfs.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/list.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/list_impl.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/note.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair_impl.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/processor.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/procset.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/sdt.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/synch.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/vmem.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/zmod.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/zmod/adler32.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/zmod/deflate.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/zmod/deflate.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inffast.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inffast.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inffixed.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inflate.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inflate.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inftrees.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inftrees.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/zmod/trees.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zconf.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zlib.h#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod_subr.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zutil.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zutil.h#1 branch .. //depot/projects/scottl-camlock/src/sys/coda/00READ#2 delete .. //depot/projects/scottl-camlock/src/sys/coda/README#2 delete .. //depot/projects/scottl-camlock/src/sys/coda/TODO#2 delete .. //depot/projects/scottl-camlock/src/sys/coda/cnode.h#6 delete .. //depot/projects/scottl-camlock/src/sys/coda/coda.h#5 delete .. //depot/projects/scottl-camlock/src/sys/coda/coda_fbsd.c#6 delete .. //depot/projects/scottl-camlock/src/sys/coda/coda_io.h#3 delete .. //depot/projects/scottl-camlock/src/sys/coda/coda_kernel.h#3 delete .. //depot/projects/scottl-camlock/src/sys/coda/coda_namecache.c#3 delete .. //depot/projects/scottl-camlock/src/sys/coda/coda_namecache.h#3 delete .. //depot/projects/scottl-camlock/src/sys/coda/coda_opstats.h#3 delete .. //depot/projects/scottl-camlock/src/sys/coda/coda_pioctl.h#3 delete .. //depot/projects/scottl-camlock/src/sys/coda/coda_psdev.c#6 delete .. //depot/projects/scottl-camlock/src/sys/coda/coda_psdev.h#4 delete .. //depot/projects/scottl-camlock/src/sys/coda/coda_subr.c#5 delete .. //depot/projects/scottl-camlock/src/sys/coda/coda_subr.h#3 delete .. //depot/projects/scottl-camlock/src/sys/coda/coda_venus.c#5 delete .. //depot/projects/scottl-camlock/src/sys/coda/coda_venus.h#4 delete .. //depot/projects/scottl-camlock/src/sys/coda/coda_vfsops.c#7 delete .. //depot/projects/scottl-camlock/src/sys/coda/coda_vfsops.h#5 delete .. //depot/projects/scottl-camlock/src/sys/coda/coda_vnops.c#9 delete .. //depot/projects/scottl-camlock/src/sys/coda/coda_vnops.h#6 delete .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_ipc.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_misc.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_proto.h#14 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_syscall.h#14 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_syscalls.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_sysent.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/syscalls.master#15 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ia32/ia32_sysvec.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linprocfs/linprocfs.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_file.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_futex.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_futex.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_getcwd.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_ioctl.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_ioctl.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_misc.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_misc.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_socket.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_stats.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ndis/kern_ndis.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ndis/ndis_var.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ndis/ntoskrnl_var.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ndis/subr_ndis.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ndis/subr_ntoskrnl.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/kern/opensolaris_atomic.c#2 delete .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/kern/opensolaris_kmem.c#3 delete .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/kern/opensolaris_kobj.c#4 delete .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/kern/opensolaris_kstat.c#3 delete .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/kern/opensolaris_misc.c#3 delete .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/kern/opensolaris_policy.c#3 delete .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/kern/opensolaris_string.c#3 delete .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/kern/opensolaris_vfs.c#6 delete .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/kern/opensolaris_zone.c#2 delete .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/machine/endian.h#2 delete .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/rpc/xdr.h#2 delete .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/acl.h#2 delete .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/atomic.h#2 delete .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/byteorder.h#2 delete .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/callb.h#2 delete .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/cmn_err.h#2 delete .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/cred.h#2 delete .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/debug.h#2 delete .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/dirent.h#2 delete .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/dkio.h#2 delete .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/dnlc.h#2 delete .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/kcondvar.h#2 delete .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/kmem.h#3 delete .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/kobj.h#2 delete .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/kstat.h#2 delete .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/lock.h#2 delete .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/misc.h#3 delete .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/mntent.h#2 delete .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/mnttab.h#2 delete .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/mount.h#2 delete .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/mutex.h#3 delete .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/policy.h#2 delete .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/proc.h#2 delete .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/random.h#2 delete .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/rwlock.h#3 delete .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/sdt.h#2 delete .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/string.h#3 delete .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/sunddi.h#2 delete .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/sysmacros.h#2 delete .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/systm.h#2 delete .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/taskq.h#2 delete .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/taskq_impl.h#2 delete .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/time.h#2 delete .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/types.h#3 delete .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/uio.h#2 delete .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/varargs.h#2 delete .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/vfs.h#3 delete .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/vnode.h#4 delete .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/zone.h#2 delete .. //depot/projects/scottl-camlock/src/sys/compat/pecoff/imgact_pecoff.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/imgact_svr4.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_fcntl.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_misc.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_stream.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_sysvec.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/conf/Makefile.amd64#7 integrate .. //depot/projects/scottl-camlock/src/sys/conf/Makefile.arm#11 integrate .. //depot/projects/scottl-camlock/src/sys/conf/NOTES#24 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files#26 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.amd64#16 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.arm#9 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.i386#16 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.ia64#12 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.pc98#15 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.powerpc#13 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.sparc64#14 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.sun4v#5 integrate .. //depot/projects/scottl-camlock/src/sys/conf/kern.post.mk#13 integrate .. //depot/projects/scottl-camlock/src/sys/conf/kern.pre.mk#10 integrate .. //depot/projects/scottl-camlock/src/sys/conf/kmod.mk#16 integrate .. //depot/projects/scottl-camlock/src/sys/conf/ldscript.powerpc#2 integrate .. //depot/projects/scottl-camlock/src/sys/conf/newvers.sh#6 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options#21 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options.amd64#8 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options.arm#14 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options.i386#9 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options.ia64#4 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options.pc98#10 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options.powerpc#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/altq/altq/altq_cbq.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/altq/altq/altq_hfsc.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/altq/altq/altq_priq.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/altq/altq/altq_red.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/altq/altq/altq_subr.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/evgpe.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/evmisc.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/evxface.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/npe/IxNpeMicrocode.dat.uu#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/npe/LICENSE#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/wpi/LICENSE#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/wpi/iwlwifi-3945-2.14.4.fw.uu#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/fil.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_auth.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_compat.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_fil.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_frag.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_htable.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_log.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_lookup.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_lookup.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_nat.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_nat.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_pool.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_pool.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_proxy.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_scan.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_state.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_state.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_sync.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ipl.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/api/cc_conn.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/common/acl/acl_common.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/common/acl/acl_common.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#4 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/common/atomic/i386/atomic.S#4 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/common/atomic/ia64/atomic.S#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/common/avl/avl.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/common/nvpair/nvpair.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/common/zfs/zfs_namecheck.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/common/zfs/zfs_namecheck.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/common/zfs/zfs_prop.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/common/zfs/zfs_prop.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/Makefile.files#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/gfs.c#4 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#5 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/bplist.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#4 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#3 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/dnode.c#3 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#3 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#3 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#3 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/gzip.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/refcount.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sha256.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#5 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#4 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#3 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/space_map.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#3 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#3 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#3 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#3 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/txg.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/unique.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#3 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#4 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#3 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c#4 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#3 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#5 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#3 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#7 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#3 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#3 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#7 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#5 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#5 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#3 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#4 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#3 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/os/callb.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/os/list.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/os/taskq.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/rpc/xdr.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/rpc/xdr.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/rpc/xdr_array.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/rpc/xdr_mem.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/asm_linkage.h#3 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/avl.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/avl_impl.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/bitmap.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/byteorder.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/callb.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/ccompile.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/compress.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/cred.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/debug.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/dkio.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/dklabel.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/errorq.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/feature_tests.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/fm/protocol.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/fm/util.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/fs/zfs.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/gfs.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/list.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/list_impl.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/note.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/nvpair.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/nvpair_impl.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/processor.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/procset.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/sdt.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/synch.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/sysevent.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/vfs.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/vmem.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/zmod.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/zmod/adler32.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/zmod/crc32.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/zmod/crc32.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/zmod/deflate.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/zmod/deflate.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/zmod/inffast.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/zmod/inffast.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/zmod/inffixed.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/zmod/inflate.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/zmod/inflate.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/zmod/inftrees.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/zmod/inftrees.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/zmod/trees.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/zmod/zconf.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/zmod/zlib.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/zmod/zmod.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/zmod/zmod_subr.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/zmod/zutil.c#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/zmod/zutil.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/if_pflog.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/if_pflog.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/if_pfsync.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/if_pfsync.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/pf.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/pf_if.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/pf_ioctl.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/pf_mtag.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/pf_norm.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/pf_osfp.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/pf_ruleset.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/pf_subr.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/pf_table.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/pfvar.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/crypto/rijndael/rijndael-api.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/crypto/rijndael/test00.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/crypto/via/padlock.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/ddb/db_capture.c#1 branch .. //depot/projects/scottl-camlock/src/sys/ddb/db_command.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/ddb/db_command.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/ddb/db_examine.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/ddb/db_input.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/ddb/db_lex.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/ddb/db_lex.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/ddb/db_main.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/ddb/db_output.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/ddb/db_ps.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/ddb/db_script.c#1 branch .. //depot/projects/scottl-camlock/src/sys/ddb/db_textdump.c#1 branch .. //depot/projects/scottl-camlock/src/sys/ddb/ddb.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aac/aac.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aac/aac_cam.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aac/aac_debug.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aac/aac_disk.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aac/aac_pci.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aac/aacreg.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aac/aacvar.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpi_support/acpi_ibm.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/Osd/OsdDebug.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/Osd/OsdSchedule.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_battery.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_cpu.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_ec.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_hpet.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_hpet.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_pci.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_pci_link.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_pcib_acpi.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_thermal.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_timer.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpiio.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpivar.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/adlink/adlink.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/agp/agp.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/agp/agp_ali.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/agp/agp_amd.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/agp/agp_amd64.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/agp/agp_ati.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/agp/agp_i810.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/agp/agp_if.m#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/agp/agp_intel.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/agp/agp_nvidia.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/agp/agp_sis.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/agp/agp_via.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/agp/agppriv.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/agp/agpreg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/agp/agpvar.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_osm.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic_osm_lib.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic_osm_lib.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/amr/amr.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/amr/amr_cam.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/amr/amr_pci.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/amr/amrreg.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/amr/amrvar.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/an/if_an.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/an/if_an_pci.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/an/if_anreg.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/arcmsr/arcmsr.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/arcmsr/arcmsr.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/asmc/asmc.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/asmc/asmcvar.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-chipset.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-disk.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-disk.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-dma.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-lowlevel.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.h#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-raid.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-usb.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cd.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cd.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-fd.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-tape.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_rate/amrr/amrr.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_rate/onoe/onoe.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_rate/sample/sample.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/if_ath.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/if_ath_pci.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/atkbdc/atkbd.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/atkbdc/atkbd_atkbdc.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/atkbdc/psm.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/awi/awi.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bce/if_bce.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bce/if_bcefw.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bce/if_bcereg.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bfe/if_bfe.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bfe/if_bfereg.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bge.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bgereg.h#16 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bktr/msp34xx.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cardbus/cardbus.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ce/if_ce.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ciss/ciss.c#17 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Mar 31 07:03:56 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 427321065671; Mon, 31 Mar 2008 07:03:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F06FC106566B for ; Mon, 31 Mar 2008 07:03:55 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EF8C98FC1D for ; Mon, 31 Mar 2008 07:03:55 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2V73tia076684 for ; Mon, 31 Mar 2008 07:03:55 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2V73tPm076682 for perforce@freebsd.org; Mon, 31 Mar 2008 07:03:55 GMT (envelope-from scottl@freebsd.org) Date: Mon, 31 Mar 2008 07:03:55 GMT Message-Id: <200803310703.m2V73tPm076682@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 139035 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 Mar 2008 07:03:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=139035 Change 139035 by scottl@scottl-deimos on 2008/03/31 07:02:59 Merge cam_xpt.c#75 (rev 1.190) to scsi_xpt.c Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#71 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_xpt.c#4 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#71 (text+ko) ==== ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_xpt.c#4 (text+ko) ==== @@ -420,6 +420,18 @@ CAM_QUIRK_NOLUNS, /*mintags*/0, /*maxtags*/0 }, { + /* + * Western Digital My Book 250GB (USB) + * hangs upon serial number probing. + * PR: 107495 + */ + { + T_DIRECT, SIP_MEDIA_FIXED, "WD", + "2500JB External", "*" + }, + CAM_QUIRK_NOSERIAL, /*mintags*/0, /*maxtags*/0 + }, + { /* Default tagged queuing parameters for all devices */ { T_ANY, SIP_MEDIA_REMOVABLE|SIP_MEDIA_FIXED, From owner-p4-projects@FreeBSD.ORG Mon Mar 31 07:06:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7EA231065671; Mon, 31 Mar 2008 07:06:59 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3E1991065670 for ; Mon, 31 Mar 2008 07:06:59 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3D2E78FC18 for ; Mon, 31 Mar 2008 07:06:59 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2V76xAh076815 for ; Mon, 31 Mar 2008 07:06:59 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2V76xPC076813 for perforce@freebsd.org; Mon, 31 Mar 2008 07:06:59 GMT (envelope-from scottl@freebsd.org) Date: Mon, 31 Mar 2008 07:06:59 GMT Message-Id: <200803310706.m2V76xPC076813@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 139036 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 Mar 2008 07:07:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=139036 Change 139036 by scottl@scottl-deimos on 2008/03/31 07:06:37 Merge cam_xpt.c#76 (rev 1.191) Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#72 integrate Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#72 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.189 2007/06/17 05:55:53 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.191 2007/10/20 23:23:12 julian Exp $"); #include #include @@ -1011,7 +1011,7 @@ } /* fire up rescan thread */ - if (kthread_create(xpt_scanner_thread, NULL, NULL, 0, 0, "xpt_thrd")) { + if (kproc_create(xpt_scanner_thread, NULL, NULL, 0, 0, "xpt_thrd")) { printf("xpt_attach: failed to create rescan thread\n"); } /* Install our software interrupt handlers */ From owner-p4-projects@FreeBSD.ORG Mon Mar 31 07:09:01 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AD4CF1065672; Mon, 31 Mar 2008 07:09:01 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6C8821065670 for ; Mon, 31 Mar 2008 07:09:01 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6BE2A8FC13 for ; Mon, 31 Mar 2008 07:09:01 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2V79118076856 for ; Mon, 31 Mar 2008 07:09:01 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2V791E7076854 for perforce@freebsd.org; Mon, 31 Mar 2008 07:09:01 GMT (envelope-from scottl@freebsd.org) Date: Mon, 31 Mar 2008 07:09:01 GMT Message-Id: <200803310709.m2V791E7076854@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 139037 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 Mar 2008 07:09:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=139037 Change 139037 by scottl@scottl-deimos on 2008/03/31 07:08:17 Merge cam_xpt.c#77 (rev 1.192) Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#73 integrate Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#73 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.191 2007/10/20 23:23:12 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.192 2007/12/16 07:49:44 scottl Exp $"); #include #include @@ -3318,6 +3318,7 @@ &work_ccb->ccb_h, xpt_links.stqe); + mtx_unlock(&xsoftc.xpt_lock); continue; } else { /* From owner-p4-projects@FreeBSD.ORG Mon Mar 31 07:10:03 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F24741065675; Mon, 31 Mar 2008 07:10:02 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B0D77106566B for ; Mon, 31 Mar 2008 07:10:02 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 962788FC22 for ; Mon, 31 Mar 2008 07:10:02 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2V7A254076901 for ; Mon, 31 Mar 2008 07:10:02 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2V7A2W6076899 for perforce@freebsd.org; Mon, 31 Mar 2008 07:10:02 GMT (envelope-from scottl@freebsd.org) Date: Mon, 31 Mar 2008 07:10:02 GMT Message-Id: <200803310710.m2V7A2W6076899@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 139038 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 Mar 2008 07:10:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=139038 Change 139038 by scottl@scottl-deimos on 2008/03/31 07:09:44 Throw away cam_xpt.c#78 (rev 1.193) Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#74 integrate Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#74 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Mon Mar 31 07:12:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1E6D41065672; Mon, 31 Mar 2008 07:12:05 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CDB53106566B for ; Mon, 31 Mar 2008 07:12:04 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CD1B28FC21 for ; Mon, 31 Mar 2008 07:12:04 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2V7C4Vm076992 for ; Mon, 31 Mar 2008 07:12:04 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2V7C4Sk076990 for perforce@freebsd.org; Mon, 31 Mar 2008 07:12:04 GMT (envelope-from scottl@freebsd.org) Date: Mon, 31 Mar 2008 07:12:04 GMT Message-Id: <200803310712.m2V7C4Sk076990@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 139039 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 Mar 2008 07:12:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=139039 Change 139039 by scottl@scottl-deimos on 2008/03/31 07:11:26 Merge cam_xpt#79 (rev 1.194) Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#75 integrate Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#75 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.192 2007/12/16 07:49:44 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.194 2008/01/28 18:13:03 brueffer Exp $"); #include #include @@ -831,7 +831,7 @@ if (base_periph_found == 1) { printf("xptioctl: pass driver is not in the " "kernel\n"); - printf("xptioctl: put \"device pass0\" in " + printf("xptioctl: put \"device pass\" in " "your kernel config file\n"); } } From owner-p4-projects@FreeBSD.ORG Mon Mar 31 07:14:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 49F4F1065672; Mon, 31 Mar 2008 07:14:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 096C2106564A for ; Mon, 31 Mar 2008 07:14:08 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0924B8FC17 for ; Mon, 31 Mar 2008 07:14:08 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2V7E7OI077063 for ; Mon, 31 Mar 2008 07:14:07 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2V7E79A077061 for perforce@freebsd.org; Mon, 31 Mar 2008 07:14:07 GMT (envelope-from scottl@freebsd.org) Date: Mon, 31 Mar 2008 07:14:07 GMT Message-Id: <200803310714.m2V7E79A077061@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 139040 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 Mar 2008 07:14:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=139040 Change 139040 by scottl@scottl-deimos on 2008/03/31 07:13:43 Merge cam_xpt.c#80,#81 (rev 1.195, 1.196) Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#76 integrate Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#76 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.194 2008/01/28 18:13:03 brueffer Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.196 2008/02/26 08:09:29 scottl Exp $"); #include #include @@ -587,6 +587,7 @@ inccb->ccb_h.target_lun) != CAM_REQ_CMP){ error = EINVAL; + CAM_SIM_UNLOCK(bus->sim); break; } /* Ensure all of our fields are correct */ From owner-p4-projects@FreeBSD.ORG Mon Mar 31 07:32:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D96CC1065676; Mon, 31 Mar 2008 07:32:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9980E1065673 for ; Mon, 31 Mar 2008 07:32:29 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9A1238FC25 for ; Mon, 31 Mar 2008 07:32:29 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2V7WT7c077752 for ; Mon, 31 Mar 2008 07:32:29 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2V7WTnT077750 for perforce@freebsd.org; Mon, 31 Mar 2008 07:32:29 GMT (envelope-from scottl@freebsd.org) Date: Mon, 31 Mar 2008 07:32:29 GMT Message-Id: <200803310732.m2V7WTnT077750@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 139045 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 Mar 2008 07:32:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=139045 Change 139045 by scottl@scottl-deimos on 2008/03/31 07:32:04 Merge cam_xpt.c#82 (rev 1.197) into scsi_probe.c and scsi_xpt.c Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#77 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_probe.c#7 edit .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_xpt.c#5 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#77 (text+ko) ==== ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_probe.c#7 (text+ko) ==== @@ -75,7 +75,8 @@ PROBE_INQUIRY, /* this counts as DV0 for Basic Domain Validation */ PROBE_FULL_INQUIRY, PROBE_MODE_SENSE, - PROBE_SERIAL_NUM, + PROBE_SERIAL_NUM_0, + PROBE_SERIAL_NUM_1, PROBE_TUR_FOR_NEGOTIATION, PROBE_INQUIRY_BASIC_DV1, PROBE_INQUIRY_BASIC_DV2, @@ -340,10 +341,42 @@ } xpt_print(periph->path, "Unable to mode sense control page - " "malloc failure\n"); - softc->action = PROBE_SERIAL_NUM; + softc->action = PROBE_SERIAL_NUM_0; } /* FALLTHROUGH */ - case PROBE_SERIAL_NUM: + case PROBE_SERIAL_NUM_0: + { + struct scsi_vpd_supported_page_list *vpd_list = NULL; + struct cam_ed *device; + + device = periph->path->device; + if ((device->quirk->quirks & CAM_QUIRK_NOSERIAL) == 0) { + vpd_list = malloc(sizeof(*vpd_list), M_CAMXPT, + M_NOWAIT | M_ZERO); + } + + if (vpd_list != NULL) { + scsi_inquiry(csio, + /*retries*/4, + probedone, + MSG_SIMPLE_Q_TAG, + (u_int8_t *)vpd_list, + sizeof(*vpd_list), + /*evpd*/TRUE, + SVPD_SUPPORTED_PAGE_LIST, + SSD_MIN_SIZE, + /*timeout*/60 * 1000); + break; + } + /* + * We'll have to do without, let our probedone + * routine finish up for us. + */ + start_ccb->csio.data_ptr = NULL; + probedone(periph, start_ccb); + return; + } + case PROBE_SERIAL_NUM_1: { struct scsi_vpd_unit_serial_number *serial_buf; struct cam_ed* device; @@ -353,10 +386,8 @@ device->serial_num = NULL; device->serial_num_len = 0; - if ((device->quirk->quirks & CAM_QUIRK_NOSERIAL) == 0) - serial_buf = (struct scsi_vpd_unit_serial_number *) - malloc(sizeof(*serial_buf), M_TEMP, - M_NOWAIT | M_ZERO); + serial_buf = (struct scsi_vpd_unit_serial_number *) + malloc(sizeof(*serial_buf), M_TEMP, M_NOWAIT | M_ZERO); if (serial_buf != NULL) { scsi_inquiry(csio, @@ -581,7 +612,7 @@ if (INQ_DATA_TQ_ENABLED(inq_buf)) softc->action = PROBE_MODE_SENSE; else - softc->action = PROBE_SERIAL_NUM; + softc->action = PROBE_SERIAL_NUM_0; path->device->flags &= ~CAM_DEV_UNCONFIGURED; @@ -646,11 +677,62 @@ } xpt_release_ccb(done_ccb); free(mode_hdr, M_TEMP); - softc->action = PROBE_SERIAL_NUM; + softc->action = PROBE_SERIAL_NUM_0; xpt_schedule(periph, priority); return; } - case PROBE_SERIAL_NUM: + case PROBE_SERIAL_NUM_0: + { + struct ccb_scsiio *csio; + struct scsi_vpd_supported_page_list *page_list; + int length, serialnum_supported, i; + + serialnum_supported = 0; + csio = &done_ccb->csio; + page_list = + (struct scsi_vpd_supported_page_list *)csio->data_ptr; + + if (page_list == NULL) { + /* + * Don't process the command as it was never sent + */ + } else if ((csio->ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_CMP + && (page_list->length > 0)) { + length = min(page_list->length, + SVPD_SUPPORTED_PAGES_SIZE); + for (i = 0; i < length; i++) { + if (page_list->list[i] == + SVPD_UNIT_SERIAL_NUMBER) { + serialnum_supported = 1; + break; + } + } + } else if (cam_periph_error(done_ccb, 0, + SF_RETRY_UA|SF_NO_PRINT, + &softc->saved_ccb) == ERESTART) { + return; + } else if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) { + /* Don't wedge the queue */ + xpt_release_devq(done_ccb->ccb_h.path, /*count*/1, + /*run_queue*/TRUE); + } + + if (page_list != NULL) + free(page_list, M_DEVBUF); + + if (serialnum_supported) { + xpt_release_ccb(done_ccb); + softc->action = PROBE_SERIAL_NUM_1; + xpt_schedule(periph, priority); + return; + } + xpt_release_ccb(done_ccb); + softc->action = PROBE_TUR_FOR_NEGOTIATION; + xpt_schedule(periph, done_ccb->ccb_h.pinfo.priority); + return; + } + + case PROBE_SERIAL_NUM_1: { struct ccb_scsiio *csio; struct scsi_vpd_unit_serial_number *serial_buf; ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_xpt.c#5 (text+ko) ==== @@ -264,7 +264,7 @@ { /* I can't believe we need a quirk for DPT volumes. */ { T_ANY, SIP_MEDIA_FIXED|SIP_MEDIA_REMOVABLE, "DPT", "*", "*" }, - CAM_QUIRK_NOSERIAL|CAM_QUIRK_NOLUNS, + CAM_QUIRK_NOLUNS, /*mintags*/0, /*maxtags*/255 }, { @@ -295,7 +295,7 @@ T_SEQUENTIAL, SIP_MEDIA_REMOVABLE, "EXABYTE", "EXB-8200*", "*" }, - CAM_QUIRK_NOSERIAL|CAM_QUIRK_NOLUNS, /*mintags*/0, /*maxtags*/0 + CAM_QUIRK_NOLUNS, /*mintags*/0, /*maxtags*/0 }, { /* @@ -306,7 +306,7 @@ T_SEQUENTIAL, SIP_MEDIA_REMOVABLE, "EXABYTE", "IPL-6860*", "*" }, - CAM_QUIRK_NOSERIAL|CAM_QUIRK_NOLUNS, /*mintags*/0, /*maxtags*/0 + CAM_QUIRK_NOLUNS, /*mintags*/0, /*maxtags*/0 }, { /* @@ -351,17 +351,6 @@ }, { /* - * Maxtor Personal Storage 3000XT (Firewire) - * hangs upon serial number probing. - */ - { - T_DIRECT, SIP_MEDIA_FIXED, "Maxtor", - "1394 storage", "*" - }, - CAM_QUIRK_NOSERIAL, /*mintags*/0, /*maxtags*/0 - }, - { - /* * Would repond to all LUNs if asked for. */ { @@ -420,18 +409,6 @@ CAM_QUIRK_NOLUNS, /*mintags*/0, /*maxtags*/0 }, { - /* - * Western Digital My Book 250GB (USB) - * hangs upon serial number probing. - * PR: 107495 - */ - { - T_DIRECT, SIP_MEDIA_FIXED, "WD", - "2500JB External", "*" - }, - CAM_QUIRK_NOSERIAL, /*mintags*/0, /*maxtags*/0 - }, - { /* Default tagged queuing parameters for all devices */ { T_ANY, SIP_MEDIA_REMOVABLE|SIP_MEDIA_FIXED, From owner-p4-projects@FreeBSD.ORG Mon Mar 31 09:30:47 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5AD9A106566C; Mon, 31 Mar 2008 09:30:47 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1A29D106564A for ; Mon, 31 Mar 2008 09:30:47 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1F6F48FC16 for ; Mon, 31 Mar 2008 09:30:47 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2V9Ukif093320 for ; Mon, 31 Mar 2008 09:30:46 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2V9Uk2S093318 for perforce@freebsd.org; Mon, 31 Mar 2008 09:30:46 GMT (envelope-from scottl@freebsd.org) Date: Mon, 31 Mar 2008 09:30:46 GMT Message-Id: <200803310930.m2V9Uk2S093318@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 139053 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 Mar 2008 09:30:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=139053 Change 139053 by scottl@scottl-deimos on 2008/03/31 09:30:05 Fix compilation of the split-out scsi_xpt.c by remerging the scsi_probe periph back into it. Keeping them separate meant exposing too many functions and structures, and the probe periph is really meant to be tightly integrated into the transport anyways. Also create a new malloc type for use in scsi_xpt.c Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#78 edit .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_probe.c#8 delete .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_xpt.c#6 edit .. //depot/projects/scottl-camlock/src/sys/modules/cam/Makefile#11 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#78 (text+ko) ==== @@ -67,7 +67,6 @@ #include #include #include -#include #include /* for xpt_print below */ #include "opt_cam.h" @@ -4655,6 +4654,7 @@ return (device); } +void xpt_devise_transport(struct cam_path *path) { struct ccb_pathinq cpi; ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_xpt.c#6 (text+ko) ==== @@ -64,7 +64,6 @@ #include #include #include -#include #include /* for xpt_print below */ #include "opt_cam.h" @@ -446,7 +445,56 @@ sysctl_cam_search_luns, "I", "allow search above LUN 7 for SCSI3 and greater devices"); +MALLOC_DEFINE(M_SCSIXPT, "CAM SCSI XPT", "CAM SCSI XPT Buffers"); + +typedef enum { + PROBE_TUR, + PROBE_INQUIRY, /* this counts as DV0 for Basic Domain Validation */ + PROBE_FULL_INQUIRY, + PROBE_MODE_SENSE, + PROBE_SERIAL_NUM_0, + PROBE_SERIAL_NUM_1, + PROBE_TUR_FOR_NEGOTIATION, + PROBE_INQUIRY_BASIC_DV1, + PROBE_INQUIRY_BASIC_DV2, + PROBE_DV_EXIT +} probe_action; + +typedef enum { + PROBE_INQUIRY_CKSUM = 0x01, + PROBE_SERIAL_CKSUM = 0x02, + PROBE_NO_ANNOUNCE = 0x04 +} probe_flags; + +typedef struct { + TAILQ_HEAD(, ccb_hdr) request_ccbs; + probe_action action; + union ccb saved_ccb; + probe_flags flags; + MD5_CTX context; + u_int8_t digest[16]; +} probe_softc; + +static void probeschedule(struct cam_periph *probe_periph); +static void proberequestdefaultnegotiation(struct cam_periph *periph); +static int proberequestbackoff(struct cam_periph *periph, + struct cam_ed *device); +static void probedone(struct cam_periph *periph, union ccb *done_ccb); +static cam_status proberegister(struct cam_periph *periph, void *arg); +static void probestart(struct cam_periph *periph, union ccb *start_ccb); +static void probecleanup(struct cam_periph *periph); +static void probe_insert_ccbq(struct cam_periph *periph, + struct ccb_hdr *ccb); +static periph_init_t probe_periph_init; +static struct periph_driver probe_driver = +{ + probe_periph_init, "probe", + TAILQ_HEAD_INITIALIZER(probe_driver.units) +}; + +PERIPHDRIVER_DECLARE(probe, probe_driver); + void xpt_find_quirk(struct cam_ed *device) { @@ -520,7 +568,7 @@ /* Save some state for use while we probe for devices */ scan_info = (xpt_scan_bus_info *) - malloc(sizeof(xpt_scan_bus_info), M_TEMP, M_NOWAIT); + malloc(sizeof(xpt_scan_bus_info), M_SCSIXPT, M_NOWAIT); scan_info->request_ccb = request_ccb; scan_info->cpi = &work_ccb->cpi; @@ -554,7 +602,7 @@ printf("xpt_scan_bus: xpt_create_path failed" " with status %#x, bus scan halted\n", status); - free(scan_info, M_TEMP); + free(scan_info, M_SCSIXPT); request_ccb->ccb_h.status = status; xpt_free_ccb(work_ccb); xpt_done(request_ccb); @@ -562,7 +610,7 @@ } work_ccb = xpt_alloc_ccb_nowait(); if (work_ccb == NULL) { - free(scan_info, M_TEMP); + free(scan_info, M_SCSIXPT); xpt_free_path(path); request_ccb->ccb_h.status = CAM_RESRC_UNAVAIL; xpt_done(request_ccb); @@ -675,7 +723,7 @@ xpt_free_ccb(request_ccb); xpt_free_ccb((union ccb *)scan_info->cpi); request_ccb = scan_info->request_ccb; - free(scan_info, M_TEMP); + free(scan_info, M_SCSIXPT); request_ccb->ccb_h.status = CAM_REQ_CMP; xpt_done(request_ccb); break; @@ -694,7 +742,7 @@ xpt_free_ccb(request_ccb); xpt_free_ccb((union ccb *)scan_info->cpi); request_ccb = scan_info->request_ccb; - free(scan_info, M_TEMP); + free(scan_info, M_SCSIXPT); request_ccb->ccb_h.status = status; xpt_done(request_ccb); break; @@ -768,17 +816,17 @@ } if (request_ccb == NULL) { - request_ccb = malloc(sizeof(union ccb), M_TEMP, M_NOWAIT); + request_ccb = malloc(sizeof(union ccb), M_SCSIXPT, M_NOWAIT); if (request_ccb == NULL) { xpt_print(path, "xpt_scan_lun: can't allocate CCB, " "can't continue\n"); return; } - new_path = malloc(sizeof(*new_path), M_TEMP, M_NOWAIT); + new_path = malloc(sizeof(*new_path), M_SCSIXPT, M_NOWAIT); if (new_path == NULL) { xpt_print(path, "xpt_scan_lun: can't allocate path, " "can't continue\n"); - free(request_ccb, M_TEMP); + free(request_ccb, M_SCSIXPT); return; } status = xpt_compile_path(new_path, xpt_periph, @@ -789,8 +837,8 @@ if (status != CAM_REQ_CMP) { xpt_print(path, "xpt_scan_lun: can't compile path, " "can't continue\n"); - free(request_ccb, M_TEMP); - free(new_path, M_TEMP); + free(request_ccb, M_SCSIXPT); + free(new_path, M_SCSIXPT); return; } xpt_setup_ccb(&request_ccb->ccb_h, new_path, /*priority*/ 1); @@ -821,8 +869,8 @@ xptscandone(struct cam_periph *periph, union ccb *done_ccb) { xpt_release_path(done_ccb->ccb_h.path); - free(done_ccb->ccb_h.path, M_TEMP); - free(done_ccb, M_TEMP); + free(done_ccb->ccb_h.path, M_SCSIXPT); + free(done_ccb, M_SCSIXPT); } static int @@ -841,3 +889,850 @@ return (EINVAL); } } + +static void +probe_periph_init() +{ +} + +static cam_status +proberegister(struct cam_periph *periph, void *arg) +{ + union ccb *request_ccb; /* CCB representing the probe request */ + cam_status status; + probe_softc *softc; + + request_ccb = (union ccb *)arg; + if (periph == NULL) { + printf("proberegister: periph was NULL!!\n"); + return(CAM_REQ_CMP_ERR); + } + + if (request_ccb == NULL) { + printf("proberegister: no probe CCB, " + "can't register device\n"); + return(CAM_REQ_CMP_ERR); + } + + softc = (probe_softc *)malloc(sizeof(*softc), M_SCSIXPT, M_NOWAIT); + + if (softc == NULL) { + printf("proberegister: Unable to probe new device. " + "Unable to allocate softc\n"); + return(CAM_REQ_CMP_ERR); + } + TAILQ_INIT(&softc->request_ccbs); + TAILQ_INSERT_TAIL(&softc->request_ccbs, &request_ccb->ccb_h, + periph_links.tqe); + softc->flags = 0; + periph->softc = softc; + status = cam_periph_acquire(periph); + if (status != CAM_REQ_CMP) { + return (status); + } + + + /* + * Ensure we've waited at least a bus settle + * delay before attempting to probe the device. + * For HBAs that don't do bus resets, this won't make a difference. + */ + cam_periph_freeze_after_event(periph, &periph->path->bus->last_reset, + scsi_delay); + probeschedule(periph); + return(CAM_REQ_CMP); +} + +static void +probeschedule(struct cam_periph *periph) +{ + struct ccb_pathinq cpi; + union ccb *ccb; + probe_softc *softc; + + softc = (probe_softc *)periph->softc; + ccb = (union ccb *)TAILQ_FIRST(&softc->request_ccbs); + + xpt_setup_ccb(&cpi.ccb_h, periph->path, /*priority*/1); + cpi.ccb_h.func_code = XPT_PATH_INQ; + xpt_action((union ccb *)&cpi); + + /* + * If a device has gone away and another device, or the same one, + * is back in the same place, it should have a unit attention + * condition pending. It will not report the unit attention in + * response to an inquiry, which may leave invalid transfer + * negotiations in effect. The TUR will reveal the unit attention + * condition. Only send the TUR for lun 0, since some devices + * will get confused by commands other than inquiry to non-existent + * luns. If you think a device has gone away start your scan from + * lun 0. This will insure that any bogus transfer settings are + * invalidated. + * + * If we haven't seen the device before and the controller supports + * some kind of transfer negotiation, negotiate with the first + * sent command if no bus reset was performed at startup. This + * ensures that the device is not confused by transfer negotiation + * settings left over by loader or BIOS action. + */ + if (((ccb->ccb_h.path->device->flags & CAM_DEV_UNCONFIGURED) == 0) + && (ccb->ccb_h.target_lun == 0)) { + softc->action = PROBE_TUR; + } else if ((cpi.hba_inquiry & (PI_WIDE_32|PI_WIDE_16|PI_SDTR_ABLE)) != 0 + && (cpi.hba_misc & PIM_NOBUSRESET) != 0) { + proberequestdefaultnegotiation(periph); + softc->action = PROBE_INQUIRY; + } else { + softc->action = PROBE_INQUIRY; + } + + if (ccb->crcn.flags & CAM_EXPECT_INQ_CHANGE) + softc->flags |= PROBE_NO_ANNOUNCE; + else + softc->flags &= ~PROBE_NO_ANNOUNCE; + + xpt_schedule(periph, ccb->ccb_h.pinfo.priority); +} + +static void +probestart(struct cam_periph *periph, union ccb *start_ccb) +{ + /* Probe the device that our peripheral driver points to */ + struct ccb_scsiio *csio; + probe_softc *softc; + + CAM_DEBUG(start_ccb->ccb_h.path, CAM_DEBUG_TRACE, ("probestart\n")); + + softc = (probe_softc *)periph->softc; + csio = &start_ccb->csio; + + switch (softc->action) { + case PROBE_TUR: + case PROBE_TUR_FOR_NEGOTIATION: + case PROBE_DV_EXIT: + { + scsi_test_unit_ready(csio, + /*retries*/4, + probedone, + MSG_SIMPLE_Q_TAG, + SSD_FULL_SIZE, + /*timeout*/60000); + break; + } + case PROBE_INQUIRY: + case PROBE_FULL_INQUIRY: + case PROBE_INQUIRY_BASIC_DV1: + case PROBE_INQUIRY_BASIC_DV2: + { + u_int inquiry_len; + struct scsi_inquiry_data *inq_buf; + + inq_buf = &periph->path->device->inq_data; + + /* + * If the device is currently configured, we calculate an + * MD5 checksum of the inquiry data, and if the serial number + * length is greater than 0, add the serial number data + * into the checksum as well. Once the inquiry and the + * serial number check finish, we attempt to figure out + * whether we still have the same device. + */ + if ((periph->path->device->flags & CAM_DEV_UNCONFIGURED) == 0) { + + MD5Init(&softc->context); + MD5Update(&softc->context, (unsigned char *)inq_buf, + sizeof(struct scsi_inquiry_data)); + softc->flags |= PROBE_INQUIRY_CKSUM; + if (periph->path->device->serial_num_len > 0) { + MD5Update(&softc->context, + periph->path->device->serial_num, + periph->path->device->serial_num_len); + softc->flags |= PROBE_SERIAL_CKSUM; + } + MD5Final(softc->digest, &softc->context); + } + + if (softc->action == PROBE_INQUIRY) + inquiry_len = SHORT_INQUIRY_LENGTH; + else + inquiry_len = SID_ADDITIONAL_LENGTH(inq_buf); + + /* + * Some parallel SCSI devices fail to send an + * ignore wide residue message when dealing with + * odd length inquiry requests. Round up to be + * safe. + */ + inquiry_len = roundup2(inquiry_len, 2); + + if (softc->action == PROBE_INQUIRY_BASIC_DV1 + || softc->action == PROBE_INQUIRY_BASIC_DV2) { + inq_buf = malloc(inquiry_len, M_SCSIXPT, M_NOWAIT); + } + if (inq_buf == NULL) { + xpt_print(periph->path, "malloc failure- skipping Basic" + "Domain Validation\n"); + softc->action = PROBE_DV_EXIT; + scsi_test_unit_ready(csio, + /*retries*/4, + probedone, + MSG_SIMPLE_Q_TAG, + SSD_FULL_SIZE, + /*timeout*/60000); + break; + } + scsi_inquiry(csio, + /*retries*/4, + probedone, + MSG_SIMPLE_Q_TAG, + (u_int8_t *)inq_buf, + inquiry_len, + /*evpd*/FALSE, + /*page_code*/0, + SSD_MIN_SIZE, + /*timeout*/60 * 1000); + break; + } + case PROBE_MODE_SENSE: + { + void *mode_buf; + int mode_buf_len; + + mode_buf_len = sizeof(struct scsi_mode_header_6) + + sizeof(struct scsi_mode_blk_desc) + + sizeof(struct scsi_control_page); + mode_buf = malloc(mode_buf_len, M_SCSIXPT, M_NOWAIT); + if (mode_buf != NULL) { + scsi_mode_sense(csio, + /*retries*/4, + probedone, + MSG_SIMPLE_Q_TAG, + /*dbd*/FALSE, + SMS_PAGE_CTRL_CURRENT, + SMS_CONTROL_MODE_PAGE, + mode_buf, + mode_buf_len, + SSD_FULL_SIZE, + /*timeout*/60000); + break; + } + xpt_print(periph->path, "Unable to mode sense control page - " + "malloc failure\n"); + softc->action = PROBE_SERIAL_NUM_0; + } + /* FALLTHROUGH */ + case PROBE_SERIAL_NUM_0: + { + struct scsi_vpd_supported_page_list *vpd_list = NULL; + struct cam_ed *device; + + device = periph->path->device; + if ((device->quirk->quirks & CAM_QUIRK_NOSERIAL) == 0) { + vpd_list = malloc(sizeof(*vpd_list), M_SCSIXPT, + M_NOWAIT | M_ZERO); + } + + if (vpd_list != NULL) { + scsi_inquiry(csio, + /*retries*/4, + probedone, + MSG_SIMPLE_Q_TAG, + (u_int8_t *)vpd_list, + sizeof(*vpd_list), + /*evpd*/TRUE, + SVPD_SUPPORTED_PAGE_LIST, + SSD_MIN_SIZE, + /*timeout*/60 * 1000); + break; + } + /* + * We'll have to do without, let our probedone + * routine finish up for us. + */ + start_ccb->csio.data_ptr = NULL; + probedone(periph, start_ccb); + return; + } + case PROBE_SERIAL_NUM_1: + { + struct scsi_vpd_unit_serial_number *serial_buf; + struct cam_ed* device; + + serial_buf = NULL; + device = periph->path->device; + device->serial_num = NULL; + device->serial_num_len = 0; + + serial_buf = (struct scsi_vpd_unit_serial_number *) + malloc(sizeof(*serial_buf), M_SCSIXPT, + M_NOWAIT | M_ZERO); + + if (serial_buf != NULL) { + scsi_inquiry(csio, + /*retries*/4, + probedone, + MSG_SIMPLE_Q_TAG, + (u_int8_t *)serial_buf, + sizeof(*serial_buf), + /*evpd*/TRUE, + SVPD_UNIT_SERIAL_NUMBER, + SSD_MIN_SIZE, + /*timeout*/60 * 1000); + break; + } + /* + * We'll have to do without, let our probedone + * routine finish up for us. + */ + start_ccb->csio.data_ptr = NULL; + probedone(periph, start_ccb); + return; + } + } + xpt_action(start_ccb); +} + +static void +proberequestdefaultnegotiation(struct cam_periph *periph) +{ + struct ccb_trans_settings cts; + + xpt_setup_ccb(&cts.ccb_h, periph->path, /*priority*/1); + cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS; + cts.type = CTS_TYPE_USER_SETTINGS; + xpt_action((union ccb *)&cts); + if ((cts.ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) { + return; + } + cts.ccb_h.func_code = XPT_SET_TRAN_SETTINGS; + cts.type = CTS_TYPE_CURRENT_SETTINGS; + xpt_action((union ccb *)&cts); +} + +/* + * Backoff Negotiation Code- only pertinent for SPI devices. + */ +static int +proberequestbackoff(struct cam_periph *periph, struct cam_ed *device) +{ + struct ccb_trans_settings cts; + struct ccb_trans_settings_spi *spi; + + memset(&cts, 0, sizeof (cts)); + xpt_setup_ccb(&cts.ccb_h, periph->path, /*priority*/1); + cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS; + cts.type = CTS_TYPE_CURRENT_SETTINGS; + xpt_action((union ccb *)&cts); + if ((cts.ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) { + if (bootverbose) { + xpt_print(periph->path, + "failed to get current device settings\n"); + } + return (0); + } + if (cts.transport != XPORT_SPI) { + if (bootverbose) { + xpt_print(periph->path, "not SPI transport\n"); + } + return (0); + } + spi = &cts.xport_specific.spi; + + /* + * We cannot renegotiate sync rate if we don't have one. + */ + if ((spi->valid & CTS_SPI_VALID_SYNC_RATE) == 0) { + if (bootverbose) { + xpt_print(periph->path, "no sync rate known\n"); + } + return (0); + } + + /* + * We'll assert that we don't have to touch PPR options- the + * SIM will see what we do with period and offset and adjust + * the PPR options as appropriate. + */ + + /* + * A sync rate with unknown or zero offset is nonsensical. + * A sync period of zero means Async. + */ + if ((spi->valid & CTS_SPI_VALID_SYNC_OFFSET) == 0 + || spi->sync_offset == 0 || spi->sync_period == 0) { + if (bootverbose) { + xpt_print(periph->path, "no sync rate available\n"); + } + return (0); + } + + if (device->flags & CAM_DEV_DV_HIT_BOTTOM) { + CAM_DEBUG(periph->path, CAM_DEBUG_INFO, + ("hit async: giving up on DV\n")); + return (0); + } + + + /* + * Jump sync_period up by one, but stop at 5MHz and fall back to Async. + * We don't try to remember 'last' settings to see if the SIM actually + * gets into the speed we want to set. We check on the SIM telling + * us that a requested speed is bad, but otherwise don't try and + * check the speed due to the asynchronous and handshake nature + * of speed setting. + */ + spi->valid = CTS_SPI_VALID_SYNC_RATE | CTS_SPI_VALID_SYNC_OFFSET; + for (;;) { + spi->sync_period++; + if (spi->sync_period >= 0xf) { + spi->sync_period = 0; + spi->sync_offset = 0; + CAM_DEBUG(periph->path, CAM_DEBUG_INFO, + ("setting to async for DV\n")); + /* + * Once we hit async, we don't want to try + * any more settings. + */ + device->flags |= CAM_DEV_DV_HIT_BOTTOM; + } else if (bootverbose) { + CAM_DEBUG(periph->path, CAM_DEBUG_INFO, + ("DV: period 0x%x\n", spi->sync_period)); + printf("setting period to 0x%x\n", spi->sync_period); + } + cts.ccb_h.func_code = XPT_SET_TRAN_SETTINGS; + cts.type = CTS_TYPE_CURRENT_SETTINGS; + xpt_action((union ccb *)&cts); + if ((cts.ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_CMP) { + break; + } + CAM_DEBUG(periph->path, CAM_DEBUG_INFO, + ("DV: failed to set period 0x%x\n", spi->sync_period)); + if (spi->sync_period == 0) { + return (0); + } + } + return (1); +} + +static void +probedone(struct cam_periph *periph, union ccb *done_ccb) +{ + probe_softc *softc; + struct cam_path *path; + u_int32_t priority; + + CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_TRACE, ("probedone\n")); + + softc = (probe_softc *)periph->softc; + path = done_ccb->ccb_h.path; + priority = done_ccb->ccb_h.pinfo.priority; + + switch (softc->action) { + case PROBE_TUR: + { + if ((done_ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) { + + if (cam_periph_error(done_ccb, 0, + SF_NO_PRINT, NULL) == ERESTART) + return; + else if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) + /* Don't wedge the queue */ + xpt_release_devq(done_ccb->ccb_h.path, + /*count*/1, + /*run_queue*/TRUE); + } + softc->action = PROBE_INQUIRY; + xpt_release_ccb(done_ccb); + xpt_schedule(periph, priority); + return; + } + case PROBE_INQUIRY: + case PROBE_FULL_INQUIRY: + { + if ((done_ccb->ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_CMP) { + struct scsi_inquiry_data *inq_buf; + u_int8_t periph_qual; + + path->device->flags |= CAM_DEV_INQUIRY_DATA_VALID; + inq_buf = &path->device->inq_data; + + periph_qual = SID_QUAL(inq_buf); + + switch(periph_qual) { + case SID_QUAL_LU_CONNECTED: + { + u_int8_t len; + + /* + * We conservatively request only + * SHORT_INQUIRY_LEN bytes of inquiry + * information during our first try + * at sending an INQUIRY. If the device + * has more information to give, + * perform a second request specifying + * the amount of information the device + * is willing to give. + */ + len = inq_buf->additional_length + + offsetof(struct scsi_inquiry_data, + additional_length) + 1; + if (softc->action == PROBE_INQUIRY + && len > SHORT_INQUIRY_LENGTH) { + softc->action = PROBE_FULL_INQUIRY; + xpt_release_ccb(done_ccb); + xpt_schedule(periph, priority); + return; + } + + xpt_find_quirk(path->device); + + xpt_devise_transport(path); + if (INQ_DATA_TQ_ENABLED(inq_buf)) + softc->action = PROBE_MODE_SENSE; + else + softc->action = PROBE_SERIAL_NUM_0; + + path->device->flags &= ~CAM_DEV_UNCONFIGURED; + + xpt_release_ccb(done_ccb); + xpt_schedule(periph, priority); + return; + } + default: + break; + } + } else if (cam_periph_error(done_ccb, 0, + done_ccb->ccb_h.target_lun > 0 + ? SF_RETRY_UA|SF_QUIET_IR + : SF_RETRY_UA, + &softc->saved_ccb) == ERESTART) { + return; + } else if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) { + /* Don't wedge the queue */ + xpt_release_devq(done_ccb->ccb_h.path, /*count*/1, + /*run_queue*/TRUE); + } + /* + * If we get to this point, we got an error status back + * from the inquiry and the error status doesn't require + * automatically retrying the command. Therefore, the + * inquiry failed. If we had inquiry information before + * for this device, but this latest inquiry command failed, + * the device has probably gone away. If this device isn't + * already marked unconfigured, notify the peripheral + * drivers that this device is no more. + */ + if ((path->device->flags & CAM_DEV_UNCONFIGURED) == 0) + /* Send the async notification. */ + xpt_async(AC_LOST_DEVICE, path, NULL); + + xpt_release_ccb(done_ccb); + break; + } + case PROBE_MODE_SENSE: + { + struct ccb_scsiio *csio; + struct scsi_mode_header_6 *mode_hdr; + + csio = &done_ccb->csio; + mode_hdr = (struct scsi_mode_header_6 *)csio->data_ptr; + if ((csio->ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_CMP) { + struct scsi_control_page *page; + u_int8_t *offset; + + offset = ((u_int8_t *)&mode_hdr[1]) + + mode_hdr->blk_desc_len; + page = (struct scsi_control_page *)offset; + path->device->queue_flags = page->queue_flags; + } else if (cam_periph_error(done_ccb, 0, + SF_RETRY_UA|SF_NO_PRINT, + &softc->saved_ccb) == ERESTART) { + return; + } else if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) { + /* Don't wedge the queue */ + xpt_release_devq(done_ccb->ccb_h.path, + /*count*/1, /*run_queue*/TRUE); + } + xpt_release_ccb(done_ccb); + free(mode_hdr, M_SCSIXPT); + softc->action = PROBE_SERIAL_NUM_0; + xpt_schedule(periph, priority); + return; + } + case PROBE_SERIAL_NUM_0: + { + struct ccb_scsiio *csio; + struct scsi_vpd_supported_page_list *page_list; + int length, serialnum_supported, i; + + serialnum_supported = 0; + csio = &done_ccb->csio; + page_list = + (struct scsi_vpd_supported_page_list *)csio->data_ptr; + + if (page_list == NULL) { + /* + * Don't process the command as it was never sent + */ + } else if ((csio->ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_CMP + && (page_list->length > 0)) { + length = min(page_list->length, + SVPD_SUPPORTED_PAGES_SIZE); + for (i = 0; i < length; i++) { + if (page_list->list[i] == + SVPD_UNIT_SERIAL_NUMBER) { + serialnum_supported = 1; + break; + } + } + } else if (cam_periph_error(done_ccb, 0, + SF_RETRY_UA|SF_NO_PRINT, + &softc->saved_ccb) == ERESTART) { + return; + } else if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) { + /* Don't wedge the queue */ + xpt_release_devq(done_ccb->ccb_h.path, /*count*/1, + /*run_queue*/TRUE); + } + + if (page_list != NULL) + free(page_list, M_DEVBUF); + + if (serialnum_supported) { + xpt_release_ccb(done_ccb); + softc->action = PROBE_SERIAL_NUM_1; + xpt_schedule(periph, priority); + return; + } + xpt_release_ccb(done_ccb); + softc->action = PROBE_TUR_FOR_NEGOTIATION; + xpt_schedule(periph, done_ccb->ccb_h.pinfo.priority); + return; + } + + case PROBE_SERIAL_NUM_1: + { + struct ccb_scsiio *csio; + struct scsi_vpd_unit_serial_number *serial_buf; + u_int32_t priority; + int changed; + int have_serialnum; + + changed = 1; + have_serialnum = 0; + csio = &done_ccb->csio; + priority = done_ccb->ccb_h.pinfo.priority; + serial_buf = + (struct scsi_vpd_unit_serial_number *)csio->data_ptr; + + /* Clean up from previous instance of this device */ + if (path->device->serial_num != NULL) { + free(path->device->serial_num, M_SCSIXPT); + path->device->serial_num = NULL; + path->device->serial_num_len = 0; + } + + if (serial_buf == NULL) { + /* + * Don't process the command as it was never sent + */ + } else if ((csio->ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_CMP + && (serial_buf->length > 0)) { + + have_serialnum = 1; + path->device->serial_num = + (u_int8_t *)malloc((serial_buf->length + 1), + M_SCSIXPT, M_NOWAIT); + if (path->device->serial_num != NULL) { + bcopy(serial_buf->serial_num, + path->device->serial_num, + serial_buf->length); + path->device->serial_num_len = + serial_buf->length; + path->device->serial_num[serial_buf->length] + = '\0'; + } + } else if (cam_periph_error(done_ccb, 0, + SF_RETRY_UA|SF_NO_PRINT, + &softc->saved_ccb) == ERESTART) { + return; + } else if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) { + /* Don't wedge the queue */ + xpt_release_devq(done_ccb->ccb_h.path, /*count*/1, + /*run_queue*/TRUE); + } + + /* + * Let's see if we have seen this device before. + */ + if ((softc->flags & PROBE_INQUIRY_CKSUM) != 0) { + MD5_CTX context; + u_int8_t digest[16]; + + MD5Init(&context); + + MD5Update(&context, + (unsigned char *)&path->device->inq_data, + sizeof(struct scsi_inquiry_data)); + + if (have_serialnum) + MD5Update(&context, serial_buf->serial_num, + serial_buf->length); + + MD5Final(digest, &context); + if (bcmp(softc->digest, digest, 16) == 0) + changed = 0; + + /* + * XXX Do we need to do a TUR in order to ensure + * that the device really hasn't changed??? + */ + if ((changed != 0) + && ((softc->flags & PROBE_NO_ANNOUNCE) == 0)) + xpt_async(AC_LOST_DEVICE, path, NULL); + } + if (serial_buf != NULL) + free(serial_buf, M_SCSIXPT); + + if (changed != 0) { + /* + * Now that we have all the necessary + * information to safely perform transfer + * negotiations... Controllers don't perform + * any negotiation or tagged queuing until + * after the first XPT_SET_TRAN_SETTINGS ccb is + * received. So, on a new device, just retrieve + * the user settings, and set them as the current + * settings to set the device up. + */ + proberequestdefaultnegotiation(periph); + xpt_release_ccb(done_ccb); + + /* + * Perform a TUR to allow the controller to + * perform any necessary transfer negotiation. + */ + softc->action = PROBE_TUR_FOR_NEGOTIATION; + xpt_schedule(periph, priority); + return; + } + xpt_release_ccb(done_ccb); + break; + } + case PROBE_TUR_FOR_NEGOTIATION: + case PROBE_DV_EXIT: + if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) { + /* Don't wedge the queue */ + xpt_release_devq(done_ccb->ccb_h.path, /*count*/1, + /*run_queue*/TRUE); + } + /* + * Do Domain Validation for lun 0 on devices that claim + * to support Synchronous Transfer modes. + */ + if (softc->action == PROBE_TUR_FOR_NEGOTIATION + && done_ccb->ccb_h.target_lun == 0 + && (path->device->inq_data.flags & SID_Sync) != 0 + && (path->device->flags & CAM_DEV_IN_DV) == 0) { + CAM_DEBUG(periph->path, CAM_DEBUG_INFO, + ("Begin Domain Validation\n")); + path->device->flags |= CAM_DEV_IN_DV; + xpt_release_ccb(done_ccb); + softc->action = PROBE_INQUIRY_BASIC_DV1; + xpt_schedule(periph, priority); + return; + } + if (softc->action == PROBE_DV_EXIT) { + CAM_DEBUG(periph->path, CAM_DEBUG_INFO, + ("Leave Domain Validation\n")); + } + path->device->flags &= + ~(CAM_DEV_UNCONFIGURED|CAM_DEV_IN_DV|CAM_DEV_DV_HIT_BOTTOM); + if ((softc->flags & PROBE_NO_ANNOUNCE) == 0) { + /* Inform the XPT that a new device has been found */ + done_ccb->ccb_h.func_code = XPT_GDEV_TYPE; + xpt_action(done_ccb); + xpt_async(AC_FOUND_DEVICE, done_ccb->ccb_h.path, + done_ccb); + } + xpt_release_ccb(done_ccb); + break; + case PROBE_INQUIRY_BASIC_DV1: + case PROBE_INQUIRY_BASIC_DV2: + { + struct scsi_inquiry_data *nbuf; + struct ccb_scsiio *csio; + + if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) { + /* Don't wedge the queue */ + xpt_release_devq(done_ccb->ccb_h.path, /*count*/1, + /*run_queue*/TRUE); + } + csio = &done_ccb->csio; + nbuf = (struct scsi_inquiry_data *)csio->data_ptr; + if (bcmp(nbuf, &path->device->inq_data, SHORT_INQUIRY_LENGTH)) { + xpt_print(path, + "inquiry data fails comparison at DV%d step\n", + softc->action == PROBE_INQUIRY_BASIC_DV1? 1 : 2); + if (proberequestbackoff(periph, path->device)) { + path->device->flags &= ~CAM_DEV_IN_DV; + softc->action = PROBE_TUR_FOR_NEGOTIATION; + } else { + /* give up */ + softc->action = PROBE_DV_EXIT; + } + free(nbuf, M_SCSIXPT); + xpt_release_ccb(done_ccb); + xpt_schedule(periph, priority); + return; + } + free(nbuf, M_SCSIXPT); + if (softc->action == PROBE_INQUIRY_BASIC_DV1) { + softc->action = PROBE_INQUIRY_BASIC_DV2; + xpt_release_ccb(done_ccb); + xpt_schedule(periph, priority); + return; + } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Mar 31 17:41:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DB4E8106566B; Mon, 31 Mar 2008 17:41:49 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9B7021065670 for ; Mon, 31 Mar 2008 17:41:49 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8C8FE8FC27 for ; Mon, 31 Mar 2008 17:41:49 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2VHfnYD052563 for ; Mon, 31 Mar 2008 17:41:49 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2VHfnJd052561 for perforce@freebsd.org; Mon, 31 Mar 2008 17:41:49 GMT (envelope-from sam@freebsd.org) Date: Mon, 31 Mar 2008 17:41:49 GMT Message-Id: <200803311741.m2VHfnJd052561@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 139089 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 Mar 2008 17:41:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=139089 Change 139089 by sam@sam_ebb on 2008/03/31 17:40:52 go back to just deq'ing the packet and not polling first before acquiring the tx buffer; will need to revisit altq later Affected files ... .. //depot/projects/vap/sys/dev/ath/if_ath.c#53 edit Differences ... ==== //depot/projects/vap/sys/dev/ath/if_ath.c#53 (text+ko) ==== @@ -1863,9 +1863,6 @@ if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0 || sc->sc_invalid) return; for (;;) { - IFQ_POLL(&ifp->if_snd, m); - if (m == NULL) - break; /* * Grab a TX buffer and associated resources. */ @@ -1877,22 +1874,19 @@ if (bf == NULL) { DPRINTF(sc, ATH_DEBUG_XMIT, "%s: out of xmit buffers\n", __func__); - /* XXX tail drop */ sc->sc_stats.ast_tx_qstop++; ifp->if_drv_flags |= IFF_DRV_OACTIVE; break; } - STAILQ_INIT(&frags); IFQ_DEQUEUE(&ifp->if_snd, m); if (m == NULL) { - /* - * The q was emptied while we blocked, - * this can happen when we're preempted. - */ - ni = NULL; - goto reclaim; + ATH_TXBUF_LOCK(sc); + STAILQ_INSERT_TAIL(&sc->sc_txbuf, bf, bf_list); + ATH_TXBUF_UNLOCK(sc); + break; } + STAILQ_INIT(&frags); ni = (struct ieee80211_node *) m->m_pkthdr.rcvif; pri = M_WME_GETAC(m); txq = sc->sc_ac2q[pri]; From owner-p4-projects@FreeBSD.ORG Mon Mar 31 17:41:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 334B11065716; Mon, 31 Mar 2008 17:41:50 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E18A21065671 for ; Mon, 31 Mar 2008 17:41:49 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A49308FC29 for ; Mon, 31 Mar 2008 17:41:49 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2VHfn2e052568 for ; Mon, 31 Mar 2008 17:41:49 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2VHfnKs052566 for perforce@freebsd.org; Mon, 31 Mar 2008 17:41:49 GMT (envelope-from sam@freebsd.org) Date: Mon, 31 Mar 2008 17:41:49 GMT Message-Id: <200803311741.m2VHfnKs052566@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 139090 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 Mar 2008 17:41:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=139090 Change 139090 by sam@sam_ebb on 2008/03/31 17:41:22 don't use IFQ_DRV_DEQUEUE until we've sorted out locking of the driver-private q Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_output.c#44 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_output.c#44 (text+ko) ==== @@ -132,7 +132,7 @@ return; } for (;;) { - IFQ_DRV_DEQUEUE(&ifp->if_snd, m); + IFQ_DEQUEUE(&ifp->if_snd, m); if (m == NULL) break; /* From owner-p4-projects@FreeBSD.ORG Mon Mar 31 18:56:12 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 794E71065674; Mon, 31 Mar 2008 18:56:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 320DC1065672 for ; Mon, 31 Mar 2008 18:56:12 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1F3548FC12 for ; Mon, 31 Mar 2008 18:56:12 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2VIuCAp056623 for ; Mon, 31 Mar 2008 18:56:12 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2VIuBCX056621 for perforce@freebsd.org; Mon, 31 Mar 2008 18:56:11 GMT (envelope-from peter-gmail@wemm.org) Date: Mon, 31 Mar 2008 18:56:11 GMT Message-Id: <200803311856.m2VIuBCX056621@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 139094 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 Mar 2008 18:56:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=139094 Change 139094 by peter@peter_daintree on 2008/03/31 18:56:10 IFC @139093 Affected files ... .. //depot/projects/hammer/Makefile#48 integrate .. //depot/projects/hammer/Makefile.inc1#133 integrate .. //depot/projects/hammer/ObsoleteFiles.inc#49 integrate .. //depot/projects/hammer/cddl/Makefile.inc#4 integrate .. //depot/projects/hammer/cddl/compat/opensolaris/include/alloca.h#1 branch .. //depot/projects/hammer/cddl/compat/opensolaris/include/devid.h#1 branch .. //depot/projects/hammer/cddl/compat/opensolaris/include/fcntl.h#1 branch .. //depot/projects/hammer/cddl/compat/opensolaris/include/fsshare.h#1 branch .. //depot/projects/hammer/cddl/compat/opensolaris/include/libintl.h#1 branch .. //depot/projects/hammer/cddl/compat/opensolaris/include/mnttab.h#1 branch .. //depot/projects/hammer/cddl/compat/opensolaris/include/priv.h#1 branch .. //depot/projects/hammer/cddl/compat/opensolaris/include/solaris.h#1 branch .. //depot/projects/hammer/cddl/compat/opensolaris/include/stdio.h#1 branch .. //depot/projects/hammer/cddl/compat/opensolaris/include/stdlib.h#1 branch .. //depot/projects/hammer/cddl/compat/opensolaris/include/strings.h#1 branch .. //depot/projects/hammer/cddl/compat/opensolaris/include/unistd.h#1 branch .. //depot/projects/hammer/cddl/compat/opensolaris/include/zone.h#1 branch .. //depot/projects/hammer/cddl/compat/opensolaris/lib/libumem/umem.c#1 branch .. //depot/projects/hammer/cddl/compat/opensolaris/lib/libumem/umem.h#1 branch .. //depot/projects/hammer/cddl/compat/opensolaris/misc/deviceid.c#1 branch .. //depot/projects/hammer/cddl/compat/opensolaris/misc/fsshare.c#1 branch .. //depot/projects/hammer/cddl/compat/opensolaris/misc/mkdirp.c#1 branch .. //depot/projects/hammer/cddl/compat/opensolaris/misc/mnttab.c#1 branch .. //depot/projects/hammer/cddl/compat/opensolaris/misc/zmount.c#1 branch .. //depot/projects/hammer/cddl/compat/opensolaris/misc/zone.c#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/zdb/zdb.8#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/zdb/zdb.c#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/zfs/zfs.8#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/zfs/zfs_util.h#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/zpool/zpool.8#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/zpool/zpool_iter.c#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/zpool/zpool_util.c#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/ztest/ztest.c#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/head/assert.h#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/head/atomic.h#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/head/libintl.h#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/head/stdio_ext.h#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/head/synch.h#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/head/thread.h#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.h#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libnvpair/nvpair_alloc_system.c#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libuutil/common/libuutil.h#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libuutil/common/libuutil_impl.h#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libuutil/common/uu_avl.c#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libuutil/common/uu_ident.c#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libuutil/common/uu_list.c#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libuutil/common/uu_misc.c#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libuutil/common/uu_open.c#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libuutil/common/uu_pname.c#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libuutil/common/uu_strtoint.c#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libzpool/common/util.c#1 branch .. //depot/projects/hammer/cddl/lib/Makefile#5 integrate .. //depot/projects/hammer/cddl/lib/libavl/Makefile#3 integrate .. //depot/projects/hammer/cddl/lib/libnvpair/Makefile#4 integrate .. //depot/projects/hammer/cddl/lib/libumem/Makefile#3 integrate .. //depot/projects/hammer/cddl/lib/libuutil/Makefile#3 integrate .. //depot/projects/hammer/cddl/lib/libzfs/Makefile#3 integrate .. //depot/projects/hammer/cddl/lib/libzpool/Makefile#4 integrate .. //depot/projects/hammer/cddl/sbin/zfs/Makefile#4 integrate .. //depot/projects/hammer/cddl/sbin/zpool/Makefile#4 integrate .. //depot/projects/hammer/cddl/usr.bin/Makefile#5 integrate .. //depot/projects/hammer/cddl/usr.bin/ztest/Makefile#4 integrate .. //depot/projects/hammer/cddl/usr.sbin/Makefile#5 integrate .. //depot/projects/hammer/cddl/usr.sbin/zdb/Makefile#4 integrate .. //depot/projects/hammer/compat/opensolaris/include/alloca.h#2 delete .. //depot/projects/hammer/compat/opensolaris/include/devid.h#3 delete .. //depot/projects/hammer/compat/opensolaris/include/fcntl.h#2 delete .. //depot/projects/hammer/compat/opensolaris/include/fsshare.h#2 delete .. //depot/projects/hammer/compat/opensolaris/include/libintl.h#2 delete .. //depot/projects/hammer/compat/opensolaris/include/mnttab.h#2 delete .. //depot/projects/hammer/compat/opensolaris/include/priv.h#2 delete .. //depot/projects/hammer/compat/opensolaris/include/solaris.h#2 delete .. //depot/projects/hammer/compat/opensolaris/include/stdio.h#2 delete .. //depot/projects/hammer/compat/opensolaris/include/stdlib.h#2 delete .. //depot/projects/hammer/compat/opensolaris/include/strings.h#2 delete .. //depot/projects/hammer/compat/opensolaris/include/unistd.h#2 delete .. //depot/projects/hammer/compat/opensolaris/include/zone.h#2 delete .. //depot/projects/hammer/compat/opensolaris/lib/libumem/umem.c#2 delete .. //depot/projects/hammer/compat/opensolaris/lib/libumem/umem.h#2 delete .. //depot/projects/hammer/compat/opensolaris/misc/deviceid.c#2 delete .. //depot/projects/hammer/compat/opensolaris/misc/fsshare.c#3 delete .. //depot/projects/hammer/compat/opensolaris/misc/mkdirp.c#2 delete .. //depot/projects/hammer/compat/opensolaris/misc/mnttab.c#2 delete .. //depot/projects/hammer/compat/opensolaris/misc/zmount.c#2 delete .. //depot/projects/hammer/compat/opensolaris/misc/zone.c#2 delete .. //depot/projects/hammer/contrib/opensolaris/OPENSOLARIS.LICENSE#2 delete .. //depot/projects/hammer/contrib/opensolaris/cmd/zdb/zdb.8#3 delete .. //depot/projects/hammer/contrib/opensolaris/cmd/zdb/zdb.c#4 delete .. //depot/projects/hammer/contrib/opensolaris/cmd/zdb/zdb_il.c#2 delete .. //depot/projects/hammer/contrib/opensolaris/cmd/zfs/zfs.8#3 delete .. //depot/projects/hammer/contrib/opensolaris/cmd/zfs/zfs_iter.c#2 delete .. //depot/projects/hammer/contrib/opensolaris/cmd/zfs/zfs_iter.h#2 delete .. //depot/projects/hammer/contrib/opensolaris/cmd/zfs/zfs_main.c#3 delete .. //depot/projects/hammer/contrib/opensolaris/cmd/zfs/zfs_util.h#2 delete .. //depot/projects/hammer/contrib/opensolaris/cmd/zpool/zpool.8#3 delete .. //depot/projects/hammer/contrib/opensolaris/cmd/zpool/zpool_iter.c#2 delete .. //depot/projects/hammer/contrib/opensolaris/cmd/zpool/zpool_main.c#2 delete .. //depot/projects/hammer/contrib/opensolaris/cmd/zpool/zpool_util.c#2 delete .. //depot/projects/hammer/contrib/opensolaris/cmd/zpool/zpool_util.h#2 delete .. //depot/projects/hammer/contrib/opensolaris/cmd/zpool/zpool_vdev.c#3 delete .. //depot/projects/hammer/contrib/opensolaris/cmd/ztest/ztest.c#3 delete .. //depot/projects/hammer/contrib/opensolaris/head/assert.h#2 delete .. //depot/projects/hammer/contrib/opensolaris/head/atomic.h#2 delete .. //depot/projects/hammer/contrib/opensolaris/head/libintl.h#2 delete .. //depot/projects/hammer/contrib/opensolaris/head/stdio_ext.h#2 delete .. //depot/projects/hammer/contrib/opensolaris/head/synch.h#2 delete .. //depot/projects/hammer/contrib/opensolaris/head/thread.h#2 delete .. //depot/projects/hammer/contrib/opensolaris/lib/libnvpair/libnvpair.c#2 delete .. //depot/projects/hammer/contrib/opensolaris/lib/libnvpair/libnvpair.h#2 delete .. //depot/projects/hammer/contrib/opensolaris/lib/libnvpair/nvpair_alloc_system.c#2 delete .. //depot/projects/hammer/contrib/opensolaris/lib/libuutil/common/libuutil.h#2 delete .. //depot/projects/hammer/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#2 delete .. //depot/projects/hammer/contrib/opensolaris/lib/libuutil/common/libuutil_impl.h#2 delete .. //depot/projects/hammer/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#2 delete .. //depot/projects/hammer/contrib/opensolaris/lib/libuutil/common/uu_avl.c#2 delete .. //depot/projects/hammer/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c#2 delete .. //depot/projects/hammer/contrib/opensolaris/lib/libuutil/common/uu_ident.c#2 delete .. //depot/projects/hammer/contrib/opensolaris/lib/libuutil/common/uu_list.c#2 delete .. //depot/projects/hammer/contrib/opensolaris/lib/libuutil/common/uu_misc.c#2 delete .. //depot/projects/hammer/contrib/opensolaris/lib/libuutil/common/uu_open.c#2 delete .. //depot/projects/hammer/contrib/opensolaris/lib/libuutil/common/uu_pname.c#2 delete .. //depot/projects/hammer/contrib/opensolaris/lib/libuutil/common/uu_strtoint.c#2 delete .. //depot/projects/hammer/contrib/opensolaris/lib/libzfs/common/libzfs.h#3 delete .. //depot/projects/hammer/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#3 delete .. //depot/projects/hammer/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#3 delete .. //depot/projects/hammer/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#3 delete .. //depot/projects/hammer/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#2 delete .. //depot/projects/hammer/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#2 delete .. //depot/projects/hammer/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#3 delete .. //depot/projects/hammer/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#2 delete .. //depot/projects/hammer/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#2 delete .. //depot/projects/hammer/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#2 delete .. //depot/projects/hammer/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#2 delete .. //depot/projects/hammer/contrib/opensolaris/lib/libzpool/common/kernel.c#3 delete .. //depot/projects/hammer/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#4 delete .. //depot/projects/hammer/contrib/opensolaris/lib/libzpool/common/taskq.c#2 delete .. //depot/projects/hammer/contrib/opensolaris/lib/libzpool/common/util.c#2 delete .. //depot/projects/hammer/contrib/pf/pfctl/pfctl_altq.c#8 integrate .. //depot/projects/hammer/contrib/pf/pfctl/pfctl_qstats.c#5 integrate .. //depot/projects/hammer/etc/network.subr#21 integrate .. //depot/projects/hammer/etc/newsyslog.conf#11 integrate .. //depot/projects/hammer/etc/rc.d/ppp#9 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#78 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/kld.c#2 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/main.c#13 integrate .. //depot/projects/hammer/include/complex.h#5 integrate .. //depot/projects/hammer/include/stdio.h#13 integrate .. //depot/projects/hammer/include/unistd.h#22 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry_private.h#3 integrate .. //depot/projects/hammer/lib/libc/gen/Makefile.inc#34 integrate .. //depot/projects/hammer/lib/libc/gen/modf.3#4 integrate .. //depot/projects/hammer/lib/libc/gen/sysctl.3#14 integrate .. //depot/projects/hammer/lib/libc/rpc/svc_vc.c#10 integrate .. //depot/projects/hammer/lib/libc/sys/Makefile.inc#33 integrate .. //depot/projects/hammer/lib/libc/sys/Symbol.map#9 integrate .. //depot/projects/hammer/lib/libc/sys/cpuset.2#1 branch .. //depot/projects/hammer/lib/libc/sys/cpuset_getaffinity.2#1 branch .. //depot/projects/hammer/lib/libc/sys/mincore.2#7 integrate .. //depot/projects/hammer/lib/libc/xdr/xdr_rec.c#5 integrate .. //depot/projects/hammer/lib/libthr/Makefile#27 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_cond.c#16 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_private.h#40 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_rwlock.c#9 integrate .. //depot/projects/hammer/lib/msun/Makefile#40 integrate .. //depot/projects/hammer/lib/msun/Symbol.map#10 integrate .. //depot/projects/hammer/lib/msun/amd64/Makefile.inc#10 integrate .. //depot/projects/hammer/lib/msun/amd64/e_remainderl.S#1 branch .. //depot/projects/hammer/lib/msun/amd64/s_remquol.S#1 branch .. //depot/projects/hammer/lib/msun/i387/Makefile.inc#11 integrate .. //depot/projects/hammer/lib/msun/i387/e_remainderl.S#1 branch .. //depot/projects/hammer/lib/msun/i387/s_remquol.S#1 branch .. //depot/projects/hammer/lib/msun/man/csqrt.3#2 integrate .. //depot/projects/hammer/lib/msun/man/hypot.3#8 integrate .. //depot/projects/hammer/lib/msun/man/remainder.3#6 integrate .. //depot/projects/hammer/lib/msun/src/e_hypot.c#4 integrate .. //depot/projects/hammer/lib/msun/src/e_hypotf.c#3 integrate .. //depot/projects/hammer/lib/msun/src/e_hypotl.c#1 branch .. //depot/projects/hammer/lib/msun/src/e_log.c#7 integrate .. //depot/projects/hammer/lib/msun/src/e_logf.c#5 integrate .. //depot/projects/hammer/lib/msun/src/e_remainder.c#5 integrate .. //depot/projects/hammer/lib/msun/src/e_remainderl.c#1 branch .. //depot/projects/hammer/lib/msun/src/math.h#36 integrate .. //depot/projects/hammer/lib/msun/src/s_csqrt.c#3 integrate .. //depot/projects/hammer/lib/msun/src/s_csqrtl.c#1 branch .. //depot/projects/hammer/lib/msun/src/s_expm1.c#3 integrate .. //depot/projects/hammer/lib/msun/src/s_expm1f.c#3 integrate .. //depot/projects/hammer/lib/msun/src/s_fmaf.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_log1p.c#4 integrate .. //depot/projects/hammer/lib/msun/src/s_log1pf.c#4 integrate .. //depot/projects/hammer/lib/msun/src/s_remquo.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_remquol.c#1 branch .. //depot/projects/hammer/lib/msun/src/w_cabs.c#4 integrate .. //depot/projects/hammer/lib/msun/src/w_cabsl.c#1 branch .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/article.sgml#31 integrate .. //depot/projects/hammer/rescue/rescue/Makefile#37 integrate .. //depot/projects/hammer/sbin/dhclient/dhclient-script#13 integrate .. //depot/projects/hammer/sbin/ggate/Makefile#7 integrate .. //depot/projects/hammer/sbin/ifconfig/ifclone.c#3 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.c#37 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.h#14 integrate .. //depot/projects/hammer/sbin/ifconfig/ifvlan.c#9 integrate .. //depot/projects/hammer/share/man/man3/Makefile#19 integrate .. //depot/projects/hammer/share/man/man4/arcmsr.4#4 integrate .. //depot/projects/hammer/share/man/man4/ng_pptpgre.4#5 integrate .. //depot/projects/hammer/share/man/man4/ubsa.4#9 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#87 integrate .. //depot/projects/hammer/share/man/man5/src.conf.5#16 integrate .. //depot/projects/hammer/share/man/man8/rc.subr.8#13 integrate .. //depot/projects/hammer/share/man/man9/Makefile#81 integrate .. //depot/projects/hammer/share/man/man9/lock.9#14 integrate .. //depot/projects/hammer/share/mk/bsd.own.mk#25 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#176 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#106 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#110 integrate .. //depot/projects/hammer/sys/amd64/include/clock.h#27 integrate .. //depot/projects/hammer/sys/amd64/include/param.h#35 integrate .. //depot/projects/hammer/sys/amd64/include/timerreg.h#3 integrate .. //depot/projects/hammer/sys/amd64/isa/clock.c#69 integrate .. //depot/projects/hammer/sys/arm/conf/AVILA#10 integrate .. //depot/projects/hammer/sys/arm/conf/BWCT#3 integrate .. //depot/projects/hammer/sys/arm/conf/CRB#4 integrate .. //depot/projects/hammer/sys/arm/conf/EP80219#5 integrate .. //depot/projects/hammer/sys/arm/conf/HL200#3 integrate .. //depot/projects/hammer/sys/arm/conf/IQ31244#15 integrate .. //depot/projects/hammer/sys/arm/conf/KB920X#7 integrate .. //depot/projects/hammer/sys/arm/conf/SIMICS#12 integrate .. //depot/projects/hammer/sys/arm/conf/SKYEYE#5 integrate .. //depot/projects/hammer/sys/arm/include/param.h#9 integrate .. //depot/projects/hammer/sys/boot/forth/loader.conf#36 integrate .. //depot/projects/hammer/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/kern/opensolaris_kstat.c#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/kern/opensolaris_string.c#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/kern/opensolaris_zone.c#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/machine/endian.h#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/rpc/xdr.h#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/acl.h#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/atomic.h#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/bitmap.h#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/byteorder.h#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/callb.h#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/cmn_err.h#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/cpupart.h#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/cpuvar.h#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/cred.h#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/cyclic.h#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/debug.h#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/dirent.h#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/dkio.h#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/dnlc.h#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/elf.h#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/kcondvar.h#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/kmem.h#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/kobj.h#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/kstat.h#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/lock.h#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/misc.h#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/mman.h#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/mntent.h#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/mnttab.h#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/modctl.h#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/mount.h#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/mutex.h#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/objfs.h#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/param.h#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/pcpu.h#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/policy.h#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/proc.h#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/random.h#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/rwlock.h#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/sdt.h#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/stat.h#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/string.h#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/sunddi.h#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/sysmacros.h#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/systm.h#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/taskq.h#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/taskq_impl.h#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/time.h#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/types.h#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/uio.h#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/varargs.h#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/vfs.h#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/vnode.h#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/zone.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/common/atomic/i386/atomic.S#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/common/atomic/ia64/atomic.S#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/common/avl/avl.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/Makefile.files#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bplist.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/gzip.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sha256.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/unique.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/os/callb.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/os/list.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/os/taskq.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_array.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_mem.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/asm_linkage.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/avl_impl.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/bitmap.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/byteorder.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/callb.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/ccompile.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/compress.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/cred.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/dkio.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/dklabel.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/errorq.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/feature_tests.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/fm/protocol.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/fm/util.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/gfs.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/list.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/list_impl.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/note.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair_impl.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/processor.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/procset.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/sdt.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/synch.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/vmem.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/zmod.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/zmod/adler32.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/zmod/deflate.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/zmod/deflate.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/zmod/inffast.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/zmod/inffast.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/zmod/inffixed.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/zmod/inflate.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/zmod/inflate.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/zmod/inftrees.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/zmod/inftrees.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/zmod/trees.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/zmod/zconf.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/zmod/zlib.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod_subr.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/zmod/zutil.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/zmod/zutil.h#1 branch .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#55 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#54 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#51 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#51 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#51 integrate .. //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#56 integrate .. //depot/projects/hammer/sys/compat/linprocfs/linprocfs.c#41 integrate .. //depot/projects/hammer/sys/compat/linux/linux_uid16.c#14 integrate .. //depot/projects/hammer/sys/compat/linux/linux_util.c#13 integrate .. //depot/projects/hammer/sys/compat/opensolaris/kern/opensolaris_atomic.c#2 delete .. //depot/projects/hammer/sys/compat/opensolaris/kern/opensolaris_kmem.c#3 delete .. //depot/projects/hammer/sys/compat/opensolaris/kern/opensolaris_kobj.c#6 delete .. //depot/projects/hammer/sys/compat/opensolaris/kern/opensolaris_kstat.c#3 delete .. //depot/projects/hammer/sys/compat/opensolaris/kern/opensolaris_misc.c#3 delete .. //depot/projects/hammer/sys/compat/opensolaris/kern/opensolaris_policy.c#3 delete .. //depot/projects/hammer/sys/compat/opensolaris/kern/opensolaris_string.c#2 delete .. //depot/projects/hammer/sys/compat/opensolaris/kern/opensolaris_vfs.c#7 delete .. //depot/projects/hammer/sys/compat/opensolaris/kern/opensolaris_zone.c#2 delete .. //depot/projects/hammer/sys/compat/opensolaris/machine/endian.h#2 delete .. //depot/projects/hammer/sys/compat/opensolaris/rpc/xdr.h#3 delete .. //depot/projects/hammer/sys/compat/opensolaris/sys/acl.h#2 delete .. //depot/projects/hammer/sys/compat/opensolaris/sys/atomic.h#3 delete .. //depot/projects/hammer/sys/compat/opensolaris/sys/bitmap.h#2 delete .. //depot/projects/hammer/sys/compat/opensolaris/sys/byteorder.h#2 delete .. //depot/projects/hammer/sys/compat/opensolaris/sys/callb.h#2 delete .. //depot/projects/hammer/sys/compat/opensolaris/sys/cmn_err.h#2 delete .. //depot/projects/hammer/sys/compat/opensolaris/sys/cpupart.h#2 delete .. //depot/projects/hammer/sys/compat/opensolaris/sys/cpuvar.h#2 delete .. //depot/projects/hammer/sys/compat/opensolaris/sys/cred.h#2 delete .. //depot/projects/hammer/sys/compat/opensolaris/sys/cyclic.h#2 delete .. //depot/projects/hammer/sys/compat/opensolaris/sys/debug.h#2 delete .. //depot/projects/hammer/sys/compat/opensolaris/sys/dirent.h#2 delete .. //depot/projects/hammer/sys/compat/opensolaris/sys/dkio.h#2 delete .. //depot/projects/hammer/sys/compat/opensolaris/sys/dnlc.h#2 delete .. //depot/projects/hammer/sys/compat/opensolaris/sys/elf.h#2 delete .. //depot/projects/hammer/sys/compat/opensolaris/sys/kcondvar.h#3 delete .. //depot/projects/hammer/sys/compat/opensolaris/sys/kmem.h#4 delete .. //depot/projects/hammer/sys/compat/opensolaris/sys/kobj.h#2 delete .. //depot/projects/hammer/sys/compat/opensolaris/sys/kstat.h#2 delete .. //depot/projects/hammer/sys/compat/opensolaris/sys/lock.h#2 delete .. //depot/projects/hammer/sys/compat/opensolaris/sys/misc.h#3 delete .. //depot/projects/hammer/sys/compat/opensolaris/sys/mman.h#2 delete .. //depot/projects/hammer/sys/compat/opensolaris/sys/mntent.h#2 delete .. //depot/projects/hammer/sys/compat/opensolaris/sys/mnttab.h#2 delete .. //depot/projects/hammer/sys/compat/opensolaris/sys/modctl.h#2 delete .. //depot/projects/hammer/sys/compat/opensolaris/sys/mount.h#2 delete .. //depot/projects/hammer/sys/compat/opensolaris/sys/mutex.h#4 delete .. //depot/projects/hammer/sys/compat/opensolaris/sys/objfs.h#2 delete .. //depot/projects/hammer/sys/compat/opensolaris/sys/param.h#2 delete .. //depot/projects/hammer/sys/compat/opensolaris/sys/pcpu.h#2 delete .. //depot/projects/hammer/sys/compat/opensolaris/sys/policy.h#2 delete .. //depot/projects/hammer/sys/compat/opensolaris/sys/proc.h#5 delete .. //depot/projects/hammer/sys/compat/opensolaris/sys/random.h#2 delete .. //depot/projects/hammer/sys/compat/opensolaris/sys/rwlock.h#4 delete .. //depot/projects/hammer/sys/compat/opensolaris/sys/sdt.h#2 delete .. //depot/projects/hammer/sys/compat/opensolaris/sys/stat.h#2 delete .. //depot/projects/hammer/sys/compat/opensolaris/sys/string.h#2 delete .. //depot/projects/hammer/sys/compat/opensolaris/sys/sunddi.h#2 delete .. //depot/projects/hammer/sys/compat/opensolaris/sys/sysmacros.h#2 delete .. //depot/projects/hammer/sys/compat/opensolaris/sys/systm.h#2 delete .. //depot/projects/hammer/sys/compat/opensolaris/sys/taskq.h#2 delete .. //depot/projects/hammer/sys/compat/opensolaris/sys/taskq_impl.h#2 delete .. //depot/projects/hammer/sys/compat/opensolaris/sys/time.h#3 delete .. //depot/projects/hammer/sys/compat/opensolaris/sys/types.h#4 delete .. //depot/projects/hammer/sys/compat/opensolaris/sys/uio.h#2 delete .. //depot/projects/hammer/sys/compat/opensolaris/sys/varargs.h#2 delete .. //depot/projects/hammer/sys/compat/opensolaris/sys/vfs.h#3 delete .. //depot/projects/hammer/sys/compat/opensolaris/sys/vnode.h#6 delete .. //depot/projects/hammer/sys/compat/opensolaris/sys/zone.h#2 delete .. //depot/projects/hammer/sys/compat/pecoff/imgact_pecoff.c#19 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_sysvec.c#18 integrate .. //depot/projects/hammer/sys/conf/NOTES#141 integrate .. //depot/projects/hammer/sys/conf/files#178 integrate .. //depot/projects/hammer/sys/conf/options#127 integrate .. //depot/projects/hammer/sys/conf/options.amd64#46 integrate .. //depot/projects/hammer/sys/conf/options.i386#51 integrate .. //depot/projects/hammer/sys/conf/options.pc98#46 integrate .. //depot/projects/hammer/sys/contrib/opensolaris/OPENSOLARIS.LICENSE#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/common/acl/acl_common.c#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/common/acl/acl_common.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#4 delete .. //depot/projects/hammer/sys/contrib/opensolaris/common/atomic/i386/atomic.S#4 delete .. //depot/projects/hammer/sys/contrib/opensolaris/common/atomic/ia64/atomic.S#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/common/avl/avl.c#3 delete .. //depot/projects/hammer/sys/contrib/opensolaris/common/nvpair/nvpair.c#3 delete .. //depot/projects/hammer/sys/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/common/zfs/zfs_namecheck.c#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/common/zfs/zfs_namecheck.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/common/zfs/zfs_prop.c#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/common/zfs/zfs_prop.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/Makefile.files#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/gfs.c#5 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#7 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/bplist.c#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#3 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/dmu.c#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#3 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/dnode.c#3 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#3 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#3 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#3 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/gzip.c#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/refcount.c#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sha256.c#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#3 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#3 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/space_map.c#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#3 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#3 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#3 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#3 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/txg.c#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/unique.c#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#4 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#3 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#5 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#3 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#3 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c#3 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#3 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#3 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#6 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#3 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#3 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#4 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#3 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#5 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#7 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#11 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#8 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#4 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#4 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#5 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/os/callb.c#3 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/os/list.c#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/os/taskq.c#3 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/rpc/xdr.c#3 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/rpc/xdr.h#3 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/rpc/xdr_array.c#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/rpc/xdr_mem.c#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/asm_linkage.h#3 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/avl.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/avl_impl.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/bitmap.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/byteorder.h#3 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/callb.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/ccompile.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/compress.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/cred.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/debug.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/dkio.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/dklabel.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/errorq.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/feature_tests.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/fm/protocol.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/fm/util.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/fs/zfs.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/gfs.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#3 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/list.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/list_impl.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/note.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/nvpair.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/nvpair_impl.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/processor.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/procset.h#3 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/sdt.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/synch.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/sysevent.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#3 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/vmem.h#3 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/zmod.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/zmod/adler32.c#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/zmod/crc32.c#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/zmod/crc32.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/zmod/deflate.c#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/zmod/deflate.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/zmod/inffast.c#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/zmod/inffast.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/zmod/inffixed.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/zmod/inflate.c#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/zmod/inflate.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/zmod/inftrees.c#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/zmod/inftrees.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/zmod/trees.c#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/zmod/zconf.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/zmod/zlib.h#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/zmod/zmod.c#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/zmod/zmod_subr.c#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/zmod/zutil.c#2 delete .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/zmod/zutil.h#2 delete .. //depot/projects/hammer/sys/contrib/pf/net/pf_if.c#12 integrate .. //depot/projects/hammer/sys/contrib/pf/net/pf_ioctl.c#27 integrate .. //depot/projects/hammer/sys/contrib/pf/net/pfvar.h#14 integrate .. //depot/projects/hammer/sys/dev/aac/aac.c#47 integrate .. //depot/projects/hammer/sys/dev/re/if_re.c#59 integrate .. //depot/projects/hammer/sys/dev/speaker/spkr.c#4 integrate .. //depot/projects/hammer/sys/dev/syscons/syscons.c#46 integrate .. //depot/projects/hammer/sys/dev/usb/ubsa.c#19 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#99 integrate .. //depot/projects/hammer/sys/fs/coda/coda_vfsops.c#6 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vfsops.c#53 integrate .. //depot/projects/hammer/sys/fs/nullfs/null_subr.c#19 integrate .. //depot/projects/hammer/sys/fs/nullfs/null_vfsops.c#30 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_vfsops.c#26 integrate .. //depot/projects/hammer/sys/geom/geom_subr.c#39 integrate .. //depot/projects/hammer/sys/geom/part/g_part.h#8 integrate .. //depot/projects/hammer/sys/geom/part/g_part_pc98.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_vfsops.c#18 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC#64 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#100 integrate .. //depot/projects/hammer/sys/i386/conf/XBOX#7 integrate .. //depot/projects/hammer/sys/i386/i386/busdma_machdep.c#37 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#110 integrate .. //depot/projects/hammer/sys/i386/i386/trap.c#60 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_util.c#7 integrate .. //depot/projects/hammer/sys/i386/include/clock.h#17 integrate .. //depot/projects/hammer/sys/i386/include/param.h#14 integrate .. //depot/projects/hammer/sys/i386/include/pmap.h#36 integrate .. //depot/projects/hammer/sys/i386/include/timerreg.h#3 integrate .. //depot/projects/hammer/sys/i386/isa/clock.c#43 integrate .. //depot/projects/hammer/sys/i386/linux/linux_sysvec.c#32 integrate .. //depot/projects/hammer/sys/ia64/conf/GENERIC#34 integrate .. //depot/projects/hammer/sys/ia64/ia64/elf_machdep.c#22 integrate .. //depot/projects/hammer/sys/ia64/ia64/machdep.c#69 integrate .. //depot/projects/hammer/sys/ia64/ia64/pmap.c#66 integrate .. //depot/projects/hammer/sys/ia64/include/clock.h#7 integrate .. //depot/projects/hammer/sys/ia64/include/md_var.h#18 integrate .. //depot/projects/hammer/sys/ia64/include/param.h#14 integrate .. //depot/projects/hammer/sys/isa/syscons_isa.c#14 integrate .. //depot/projects/hammer/sys/kern/init_sysent.c#68 integrate .. //depot/projects/hammer/sys/kern/kern_cpuset.c#4 integrate .. //depot/projects/hammer/sys/kern/kern_exec.c#80 integrate .. //depot/projects/hammer/sys/kern/kern_jail.c#29 integrate .. //depot/projects/hammer/sys/kern/makesyscalls.sh#13 integrate .. //depot/projects/hammer/sys/kern/syscalls.c#66 integrate .. //depot/projects/hammer/sys/kern/syscalls.master#68 integrate .. //depot/projects/hammer/sys/kern/systrace_args.c#12 integrate .. //depot/projects/hammer/sys/kern/tty_cons.c#27 integrate .. //depot/projects/hammer/sys/kern/uipc_mqueue.c#15 integrate .. //depot/projects/hammer/sys/kern/vfs_acl.c#6 integrate .. //depot/projects/hammer/sys/kern/vfs_bio.c#88 integrate .. //depot/projects/hammer/sys/kern/vfs_cache.c#29 integrate .. //depot/projects/hammer/sys/kern/vfs_extattr.c#5 integrate .. //depot/projects/hammer/sys/kern/vfs_lookup.c#35 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#91 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#129 integrate .. //depot/projects/hammer/sys/kern/vfs_syscalls.c#80 integrate .. //depot/projects/hammer/sys/kern/vfs_vnops.c#54 integrate .. //depot/projects/hammer/sys/modules/Makefile#122 integrate .. //depot/projects/hammer/sys/modules/bktr/bktr/Makefile#6 integrate .. //depot/projects/hammer/sys/modules/em/Makefile#7 integrate .. //depot/projects/hammer/sys/modules/geom/geom_part/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/geom/geom_part/geom_part_pc98/Makefile#1 branch .. //depot/projects/hammer/sys/modules/igb/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/ixgbe/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/krpc/Makefile#1 branch .. //depot/projects/hammer/sys/modules/nfslockd/Makefile#1 branch .. //depot/projects/hammer/sys/modules/sound/driver/emu10kx/Makefile#5 integrate .. //depot/projects/hammer/sys/modules/uslcom/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/wpi/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/zfs/Makefile#8 integrate .. //depot/projects/hammer/sys/net/bpf_zerocopy.c#2 integrate .. //depot/projects/hammer/sys/net/if.h#31 integrate .. //depot/projects/hammer/sys/netgraph/ng_base.c#57 integrate .. //depot/projects/hammer/sys/netgraph/ng_car.c#4 integrate .. //depot/projects/hammer/sys/netgraph/ng_pptpgre.c#16 integrate .. //depot/projects/hammer/sys/netncp/ncp_conn.c#13 integrate .. //depot/projects/hammer/sys/netsmb/smb_iod.c#13 integrate .. //depot/projects/hammer/sys/nlm/nlm_prot_clnt.c#2 integrate .. //depot/projects/hammer/sys/nlm/nlm_prot_impl.c#2 integrate .. //depot/projects/hammer/sys/nlm/nlm_prot_server.c#2 integrate .. //depot/projects/hammer/sys/nlm/nlm_prot_svc.c#2 integrate .. //depot/projects/hammer/sys/nlm/nlm_prot_xdr.c#2 integrate .. //depot/projects/hammer/sys/nlm/sm_inter_xdr.c#2 integrate .. //depot/projects/hammer/sys/pc98/cbus/clock.c#13 integrate .. //depot/projects/hammer/sys/pc98/cbus/syscons_cbus.c#5 integrate .. //depot/projects/hammer/sys/pc98/conf/GENERIC#50 integrate .. //depot/projects/hammer/sys/pc98/conf/NOTES#62 integrate .. //depot/projects/hammer/sys/pc98/include/clock.h#3 integrate .. //depot/projects/hammer/sys/pc98/include/timerreg.h#3 integrate .. //depot/projects/hammer/sys/pci/if_rlreg.h#33 integrate .. //depot/projects/hammer/sys/powerpc/aim/clock.c#2 integrate .. //depot/projects/hammer/sys/powerpc/booke/clock.c#2 integrate .. //depot/projects/hammer/sys/powerpc/conf/GENERIC#38 integrate .. //depot/projects/hammer/sys/powerpc/include/clock.h#5 integrate .. //depot/projects/hammer/sys/powerpc/include/param.h#11 integrate .. //depot/projects/hammer/sys/rpc/auth_unix.c#2 integrate .. //depot/projects/hammer/sys/rpc/authunix_prot.c#2 integrate .. //depot/projects/hammer/sys/rpc/clnt_dg.c#2 integrate .. //depot/projects/hammer/sys/rpc/clnt_rc.c#2 integrate .. //depot/projects/hammer/sys/rpc/clnt_vc.c#2 integrate .. //depot/projects/hammer/sys/rpc/inet_ntop.c#2 integrate .. //depot/projects/hammer/sys/rpc/inet_pton.c#2 integrate .. //depot/projects/hammer/sys/rpc/rpc_generic.c#2 integrate .. //depot/projects/hammer/sys/rpc/rpcb_clnt.c#2 integrate .. //depot/projects/hammer/sys/rpc/svc.c#2 integrate .. //depot/projects/hammer/sys/rpc/svc_auth_unix.c#2 integrate .. //depot/projects/hammer/sys/rpc/svc_dg.c#2 integrate .. //depot/projects/hammer/sys/rpc/svc_generic.c#2 integrate .. //depot/projects/hammer/sys/rpc/svc_vc.c#2 integrate .. //depot/projects/hammer/sys/security/mac/mac_syscalls.c#7 integrate .. //depot/projects/hammer/sys/sparc64/conf/GENERIC#60 integrate .. //depot/projects/hammer/sys/sparc64/include/clock.h#4 integrate .. //depot/projects/hammer/sys/sparc64/include/param.h#11 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/clock.c#5 integrate .. //depot/projects/hammer/sys/sun4v/conf/GENERIC#8 integrate .. //depot/projects/hammer/sys/sun4v/include/clock.h#2 integrate .. //depot/projects/hammer/sys/sun4v/include/param.h#2 integrate .. //depot/projects/hammer/sys/sys/aac_ioctl.h#3 integrate .. //depot/projects/hammer/sys/sys/buf.h#37 integrate .. //depot/projects/hammer/sys/sys/cpuset.h#4 integrate .. //depot/projects/hammer/sys/sys/fcntl.h#8 integrate .. //depot/projects/hammer/sys/sys/imgact.h#11 integrate .. //depot/projects/hammer/sys/sys/lockmgr.h#19 integrate .. //depot/projects/hammer/sys/sys/mman.h#10 integrate .. //depot/projects/hammer/sys/sys/namei.h#13 integrate .. //depot/projects/hammer/sys/sys/param.h#109 integrate .. //depot/projects/hammer/sys/sys/stat.h#14 integrate .. //depot/projects/hammer/sys/sys/syscall.h#65 integrate .. //depot/projects/hammer/sys/sys/syscall.mk#65 integrate .. //depot/projects/hammer/sys/sys/syscallsubr.h#31 integrate .. //depot/projects/hammer/sys/sys/sysproto.h#66 integrate .. //depot/projects/hammer/sys/sys/systm.h#53 integrate .. //depot/projects/hammer/sys/sys/time.h#14 integrate .. //depot/projects/hammer/sys/sys/vnode.h#78 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_snapshot.c#54 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#74 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vnops.c#51 integrate .. //depot/projects/hammer/sys/vm/vm_kern.c#30 integrate .. //depot/projects/hammer/sys/vm/vm_object.c#76 integrate .. //depot/projects/hammer/tools/build/mk/OptionalObsoleteFiles.inc#11 integrate .. //depot/projects/hammer/tools/build/options/WITHOUT_LIBKSE#2 delete .. //depot/projects/hammer/tools/regression/lib/msun/test-csqrt.c#2 integrate .. //depot/projects/hammer/tools/regression/lib/msun/test-rem.c#3 integrate .. //depot/projects/hammer/usr.bin/Makefile#61 integrate .. //depot/projects/hammer/usr.bin/awk/Makefile#8 integrate .. //depot/projects/hammer/usr.bin/fstat/zfs/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/Makefile#88 integrate .. //depot/projects/hammer/usr.sbin/amd/amd/Makefile#9 integrate .. //depot/projects/hammer/usr.sbin/clear_locks/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/fifolog/fifolog_reader/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/fifolog/fifolog_reader/fifolog_reader.c#2 integrate .. //depot/projects/hammer/usr.sbin/ngctl/Makefile#7 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/Makefile#10 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/add/perform.c#10 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/sign/Makefile#6 delete .. //depot/projects/hammer/usr.sbin/pkg_install/sign/README#2 delete .. //depot/projects/hammer/usr.sbin/pkg_install/sign/check.c#2 delete .. //depot/projects/hammer/usr.sbin/pkg_install/sign/common.c#2 delete .. //depot/projects/hammer/usr.sbin/pkg_install/sign/extern.h#3 delete .. //depot/projects/hammer/usr.sbin/pkg_install/sign/gzip.c#2 delete .. //depot/projects/hammer/usr.sbin/pkg_install/sign/gzip.h#3 delete .. //depot/projects/hammer/usr.sbin/pkg_install/sign/main.c#3 delete .. //depot/projects/hammer/usr.sbin/pkg_install/sign/pgp.h#3 delete .. //depot/projects/hammer/usr.sbin/pkg_install/sign/pgp_check.c#2 delete .. //depot/projects/hammer/usr.sbin/pkg_install/sign/pgp_sign.c#3 delete .. //depot/projects/hammer/usr.sbin/pkg_install/sign/pkg_sign.1#6 delete .. //depot/projects/hammer/usr.sbin/pkg_install/sign/sha1.c#3 delete .. //depot/projects/hammer/usr.sbin/pkg_install/sign/sign.c#5 delete .. //depot/projects/hammer/usr.sbin/pkg_install/sign/stand.c#3 delete .. //depot/projects/hammer/usr.sbin/pkg_install/sign/stand.h#4 delete .. //depot/projects/hammer/usr.sbin/pkg_install/sign/x509.c#5 delete .. //depot/projects/hammer/usr.sbin/rpc.lockd/lockd.c#10 integrate .. //depot/projects/hammer/usr.sbin/rpc.lockd/rpc.lockd.8#7 integrate Differences ... ==== //depot/projects/hammer/Makefile#48 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.346 2008/03/25 15:47:22 ru Exp $ +# $FreeBSD: src/Makefile,v 1.347 2008/03/31 13:32:55 pav Exp $ # # The user-driven targets are: # @@ -36,7 +36,7 @@ # The user-driven targets (as listed above) are implemented in Makefile.inc1. # # If you want to build your system from source be sure that /usr/obj has -# at least 400MB of diskspace available. +# at least 800MB of diskspace available. # # For individuals wanting to build from the sources currently on their # system, the simple instructions are: ==== //depot/projects/hammer/Makefile.inc1#133 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.601 2008/03/02 11:10:46 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.602 2008/03/29 17:44:38 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -1051,18 +1051,14 @@ ${_lib_libgssapi} ${_lib_libipx} \ lib/libkiconv lib/libkvm lib/libmd \ lib/ncurses/ncurses lib/ncurses/ncursesw \ - lib/libopie lib/libpam ${_default_thread_lib} \ + lib/libopie lib/libpam ${_lib_libthr} \ lib/libradius lib/libsbuf lib/libtacplus lib/libutil \ ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ ${_secure_lib_libssl} -.if ${MK_LIBTHR} != "no" && ${MK_LIBKSE} != "no" -_default_thread_lib= lib/${DEFAULT_THREAD_LIB} -.elif ${MK_LIBTHR} != "no" -_default_thread_lib= lib/libthr -.elif ${MK_LIBKSE} != "no" -_default_thread_lib= lib/libkse +.if ${MK_LIBTHR} != "no" +_lib_libthr= lib/libthr >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Mar 31 18:57:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 122B91065677; Mon, 31 Mar 2008 18:57:14 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C3BCB1065671 for ; Mon, 31 Mar 2008 18:57:13 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B13DB8FC20 for ; Mon, 31 Mar 2008 18:57:13 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2VIvD0F056704 for ; Mon, 31 Mar 2008 18:57:13 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2VIvD9D056702 for perforce@freebsd.org; Mon, 31 Mar 2008 18:57:13 GMT (envelope-from peter-gmail@wemm.org) Date: Mon, 31 Mar 2008 18:57:13 GMT Message-Id: <200803311857.m2VIvD9D056702@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 139095 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 Mar 2008 18:57:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=139095 Change 139095 by peter@peter_daintree on 2008/03/31 18:56:59 IFC @139093 Affected files ... .. //depot/projects/bike_sched/sys/amd64/amd64/pmap.c#9 integrate .. //depot/projects/bike_sched/sys/amd64/conf/GENERIC#7 integrate .. //depot/projects/bike_sched/sys/amd64/conf/NOTES#6 integrate .. //depot/projects/bike_sched/sys/amd64/include/clock.h#4 integrate .. //depot/projects/bike_sched/sys/amd64/include/param.h#2 integrate .. //depot/projects/bike_sched/sys/amd64/include/timerreg.h#2 integrate .. //depot/projects/bike_sched/sys/amd64/isa/clock.c#5 integrate .. //depot/projects/bike_sched/sys/arm/conf/AVILA#5 integrate .. //depot/projects/bike_sched/sys/arm/conf/BWCT#3 integrate .. //depot/projects/bike_sched/sys/arm/conf/CRB#3 integrate .. //depot/projects/bike_sched/sys/arm/conf/EP80219#3 integrate .. //depot/projects/bike_sched/sys/arm/conf/HL200#3 integrate .. //depot/projects/bike_sched/sys/arm/conf/IQ31244#5 integrate .. //depot/projects/bike_sched/sys/arm/conf/KB920X#6 integrate .. //depot/projects/bike_sched/sys/arm/conf/SIMICS#5 integrate .. //depot/projects/bike_sched/sys/arm/conf/SKYEYE#5 integrate .. //depot/projects/bike_sched/sys/arm/include/param.h#2 integrate .. //depot/projects/bike_sched/sys/boot/forth/loader.conf#3 integrate .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/kern/opensolaris_kstat.c#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/kern/opensolaris_string.c#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/kern/opensolaris_zone.c#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/machine/endian.h#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/rpc/xdr.h#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/sys/acl.h#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/sys/atomic.h#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/sys/bitmap.h#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/sys/byteorder.h#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/sys/callb.h#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/sys/cmn_err.h#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/sys/cpupart.h#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/sys/cpuvar.h#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/sys/cred.h#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/sys/cyclic.h#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/sys/debug.h#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/sys/dirent.h#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/sys/dkio.h#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/sys/dnlc.h#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/sys/elf.h#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/sys/kcondvar.h#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/sys/kmem.h#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/sys/kobj.h#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/sys/kstat.h#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/sys/lock.h#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/sys/misc.h#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/sys/mman.h#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/sys/mntent.h#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/sys/mnttab.h#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/sys/modctl.h#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/sys/mount.h#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/sys/mutex.h#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/sys/objfs.h#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/sys/param.h#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/sys/pcpu.h#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/sys/policy.h#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/sys/proc.h#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/sys/random.h#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/sys/rwlock.h#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/sys/sdt.h#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/sys/stat.h#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/sys/string.h#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/sys/sunddi.h#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/sys/sysmacros.h#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/sys/systm.h#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/sys/taskq.h#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/sys/taskq_impl.h#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/sys/time.h#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/sys/types.h#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/sys/uio.h#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/sys/varargs.h#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/sys/vfs.h#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/sys/vnode.h#1 branch .. //depot/projects/bike_sched/sys/cddl/compat/opensolaris/sys/zone.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/common/atomic/i386/atomic.S#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/common/atomic/ia64/atomic.S#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/common/avl/avl.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/Makefile.files#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bplist.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/gzip.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sha256.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/unique.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/os/callb.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/os/list.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/os/taskq.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_array.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_mem.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/sys/asm_linkage.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/sys/avl_impl.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/sys/bitmap.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/sys/byteorder.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/sys/callb.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/sys/ccompile.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/sys/compress.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/sys/cred.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/sys/dkio.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/sys/dklabel.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/sys/errorq.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/sys/feature_tests.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/sys/fm/protocol.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/sys/fm/util.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/sys/gfs.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/sys/list.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/sys/list_impl.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/sys/note.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair_impl.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/sys/processor.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/sys/procset.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/sys/sdt.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/sys/synch.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/sys/vmem.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/sys/zmod.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/zmod/adler32.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/zmod/deflate.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/zmod/deflate.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/zmod/inffast.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/zmod/inffast.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/zmod/inffixed.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/zmod/inflate.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/zmod/inflate.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/zmod/inftrees.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/zmod/inftrees.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/zmod/trees.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/zmod/zconf.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/zmod/zlib.h#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod_subr.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/zmod/zutil.c#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/zmod/zutil.h#1 branch .. //depot/projects/bike_sched/sys/compat/freebsd32/freebsd32_misc.c#6 integrate .. //depot/projects/bike_sched/sys/compat/freebsd32/freebsd32_proto.h#6 integrate .. //depot/projects/bike_sched/sys/compat/freebsd32/freebsd32_syscall.h#7 integrate .. //depot/projects/bike_sched/sys/compat/freebsd32/freebsd32_syscalls.c#7 integrate .. //depot/projects/bike_sched/sys/compat/freebsd32/freebsd32_sysent.c#7 integrate .. //depot/projects/bike_sched/sys/compat/freebsd32/syscalls.master#8 integrate .. //depot/projects/bike_sched/sys/compat/linprocfs/linprocfs.c#5 integrate .. //depot/projects/bike_sched/sys/compat/linux/linux_uid16.c#3 integrate .. //depot/projects/bike_sched/sys/compat/linux/linux_util.c#3 integrate .. //depot/projects/bike_sched/sys/compat/opensolaris/kern/opensolaris_atomic.c#2 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/kern/opensolaris_kmem.c#3 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/kern/opensolaris_kobj.c#3 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/kern/opensolaris_kstat.c#2 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/kern/opensolaris_misc.c#2 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/kern/opensolaris_policy.c#2 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/kern/opensolaris_string.c#2 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/kern/opensolaris_vfs.c#3 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/kern/opensolaris_zone.c#2 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/machine/endian.h#2 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/rpc/xdr.h#2 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/sys/acl.h#2 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/sys/atomic.h#2 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/sys/bitmap.h#2 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/sys/byteorder.h#2 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/sys/callb.h#2 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/sys/cmn_err.h#2 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/sys/cpupart.h#2 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/sys/cpuvar.h#2 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/sys/cred.h#2 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/sys/cyclic.h#2 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/sys/debug.h#2 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/sys/dirent.h#2 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/sys/dkio.h#2 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/sys/dnlc.h#2 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/sys/elf.h#2 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/sys/kcondvar.h#2 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/sys/kmem.h#3 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/sys/kobj.h#2 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/sys/kstat.h#2 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/sys/lock.h#2 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/sys/misc.h#2 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/sys/mman.h#2 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/sys/mntent.h#2 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/sys/mnttab.h#2 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/sys/modctl.h#2 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/sys/mount.h#2 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/sys/mutex.h#2 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/sys/objfs.h#2 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/sys/param.h#2 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/sys/pcpu.h#2 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/sys/policy.h#2 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/sys/proc.h#2 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/sys/random.h#2 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/sys/rwlock.h#2 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/sys/sdt.h#2 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/sys/stat.h#2 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/sys/string.h#2 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/sys/sunddi.h#2 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/sys/sysmacros.h#2 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/sys/systm.h#2 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/sys/taskq.h#2 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/sys/taskq_impl.h#2 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/sys/time.h#2 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/sys/types.h#2 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/sys/uio.h#2 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/sys/varargs.h#2 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/sys/vfs.h#2 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/sys/vnode.h#3 delete .. //depot/projects/bike_sched/sys/compat/opensolaris/sys/zone.h#2 delete .. //depot/projects/bike_sched/sys/compat/pecoff/imgact_pecoff.c#4 integrate .. //depot/projects/bike_sched/sys/compat/svr4/svr4_sysvec.c#5 integrate .. //depot/projects/bike_sched/sys/conf/NOTES#7 integrate .. //depot/projects/bike_sched/sys/conf/files#10 integrate .. //depot/projects/bike_sched/sys/conf/options#7 integrate .. //depot/projects/bike_sched/sys/conf/options.amd64#3 integrate .. //depot/projects/bike_sched/sys/conf/options.i386#3 integrate .. //depot/projects/bike_sched/sys/conf/options.pc98#3 integrate .. //depot/projects/bike_sched/sys/contrib/opensolaris/OPENSOLARIS.LICENSE#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/common/acl/acl_common.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/common/acl/acl_common.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/common/atomic/i386/atomic.S#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/common/atomic/ia64/atomic.S#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/common/avl/avl.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/common/nvpair/nvpair.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/common/zfs/zfs_namecheck.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/common/zfs/zfs_namecheck.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/common/zfs/zfs_prop.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/common/zfs/zfs_prop.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/Makefile.files#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/gfs.c#3 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#3 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/bplist.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/dmu.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/dnode.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/gzip.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/refcount.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/sha256.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/space_map.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/txg.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/unique.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#3 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#3 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#3 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#5 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#3 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/os/callb.c#3 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/os/list.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/os/taskq.c#3 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/rpc/xdr.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/rpc/xdr.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/rpc/xdr_array.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/rpc/xdr_mem.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/sys/asm_linkage.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/sys/avl.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/sys/avl_impl.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/sys/bitmap.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/sys/byteorder.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/sys/callb.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/sys/ccompile.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/sys/compress.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/sys/cred.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/sys/debug.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/sys/dkio.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/sys/dklabel.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/sys/errorq.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/sys/feature_tests.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/sys/fm/protocol.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/sys/fm/util.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/sys/fs/zfs.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/sys/gfs.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/sys/list.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/sys/list_impl.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/sys/note.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/sys/nvpair.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/sys/nvpair_impl.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/sys/processor.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/sys/procset.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/sys/sdt.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/sys/synch.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/sys/sysevent.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/sys/vmem.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/sys/zmod.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/zmod/adler32.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/zmod/crc32.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/zmod/crc32.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/zmod/deflate.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/zmod/deflate.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/zmod/inffast.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/zmod/inffast.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/zmod/inffixed.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/zmod/inflate.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/zmod/inflate.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/zmod/inftrees.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/zmod/inftrees.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/zmod/trees.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/zmod/zconf.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/zmod/zlib.h#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/zmod/zmod.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/zmod/zmod_subr.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/zmod/zutil.c#2 delete .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/zmod/zutil.h#2 delete .. //depot/projects/bike_sched/sys/contrib/pf/net/pf_if.c#3 integrate .. //depot/projects/bike_sched/sys/contrib/pf/net/pf_ioctl.c#3 integrate .. //depot/projects/bike_sched/sys/contrib/pf/net/pfvar.h#3 integrate .. //depot/projects/bike_sched/sys/dev/aac/aac.c#6 integrate .. //depot/projects/bike_sched/sys/dev/re/if_re.c#6 integrate .. //depot/projects/bike_sched/sys/dev/speaker/spkr.c#4 integrate .. //depot/projects/bike_sched/sys/dev/syscons/syscons.c#5 integrate .. //depot/projects/bike_sched/sys/dev/usb/ubsa.c#4 integrate .. //depot/projects/bike_sched/sys/dev/usb/usbdevs#7 integrate .. //depot/projects/bike_sched/sys/fs/coda/coda_vfsops.c#3 integrate .. //depot/projects/bike_sched/sys/fs/msdosfs/msdosfs_vfsops.c#5 integrate .. //depot/projects/bike_sched/sys/fs/nullfs/null_subr.c#4 integrate .. //depot/projects/bike_sched/sys/fs/nullfs/null_vfsops.c#4 integrate .. //depot/projects/bike_sched/sys/fs/unionfs/union_vfsops.c#4 integrate .. //depot/projects/bike_sched/sys/geom/geom_subr.c#4 integrate .. //depot/projects/bike_sched/sys/geom/part/g_part.h#4 integrate .. //depot/projects/bike_sched/sys/geom/part/g_part_pc98.c#1 branch .. //depot/projects/bike_sched/sys/gnu/fs/ext2fs/ext2_vfsops.c#4 integrate .. //depot/projects/bike_sched/sys/i386/conf/GENERIC#7 integrate .. //depot/projects/bike_sched/sys/i386/conf/NOTES#6 integrate .. //depot/projects/bike_sched/sys/i386/conf/XBOX#4 integrate .. //depot/projects/bike_sched/sys/i386/i386/busdma_machdep.c#4 integrate .. //depot/projects/bike_sched/sys/i386/i386/pmap.c#7 integrate .. //depot/projects/bike_sched/sys/i386/i386/trap.c#6 integrate .. //depot/projects/bike_sched/sys/i386/ibcs2/ibcs2_util.c#2 integrate .. //depot/projects/bike_sched/sys/i386/include/clock.h#4 integrate .. //depot/projects/bike_sched/sys/i386/include/param.h#2 integrate .. //depot/projects/bike_sched/sys/i386/include/pmap.h#4 integrate .. //depot/projects/bike_sched/sys/i386/include/timerreg.h#2 integrate .. //depot/projects/bike_sched/sys/i386/isa/clock.c#5 integrate .. //depot/projects/bike_sched/sys/i386/linux/linux_sysvec.c#5 integrate .. //depot/projects/bike_sched/sys/ia64/conf/GENERIC#6 integrate .. //depot/projects/bike_sched/sys/ia64/ia64/elf_machdep.c#3 integrate .. //depot/projects/bike_sched/sys/ia64/ia64/machdep.c#9 integrate .. //depot/projects/bike_sched/sys/ia64/ia64/pmap.c#5 integrate .. //depot/projects/bike_sched/sys/ia64/include/clock.h#3 integrate .. //depot/projects/bike_sched/sys/ia64/include/md_var.h#5 integrate .. //depot/projects/bike_sched/sys/ia64/include/param.h#2 integrate .. //depot/projects/bike_sched/sys/isa/syscons_isa.c#4 integrate .. //depot/projects/bike_sched/sys/kern/init_sysent.c#9 integrate .. //depot/projects/bike_sched/sys/kern/kern_cpuset.c#3 integrate .. //depot/projects/bike_sched/sys/kern/kern_exec.c#5 integrate .. //depot/projects/bike_sched/sys/kern/kern_jail.c#4 integrate .. //depot/projects/bike_sched/sys/kern/makesyscalls.sh#4 integrate .. //depot/projects/bike_sched/sys/kern/syscalls.c#8 integrate .. //depot/projects/bike_sched/sys/kern/syscalls.master#10 integrate .. //depot/projects/bike_sched/sys/kern/systrace_args.c#5 integrate .. //depot/projects/bike_sched/sys/kern/tty_cons.c#5 integrate .. //depot/projects/bike_sched/sys/kern/uipc_mqueue.c#4 integrate .. //depot/projects/bike_sched/sys/kern/vfs_acl.c#4 integrate .. //depot/projects/bike_sched/sys/kern/vfs_bio.c#6 integrate .. //depot/projects/bike_sched/sys/kern/vfs_cache.c#6 integrate .. //depot/projects/bike_sched/sys/kern/vfs_extattr.c#3 integrate .. //depot/projects/bike_sched/sys/kern/vfs_lookup.c#5 integrate .. //depot/projects/bike_sched/sys/kern/vfs_mount.c#6 integrate .. //depot/projects/bike_sched/sys/kern/vfs_subr.c#8 integrate .. //depot/projects/bike_sched/sys/kern/vfs_syscalls.c#6 integrate .. //depot/projects/bike_sched/sys/kern/vfs_vnops.c#6 integrate .. //depot/projects/bike_sched/sys/modules/Makefile#5 integrate .. //depot/projects/bike_sched/sys/modules/bktr/bktr/Makefile#2 integrate .. //depot/projects/bike_sched/sys/modules/em/Makefile#4 integrate .. //depot/projects/bike_sched/sys/modules/geom/geom_part/Makefile#3 integrate .. //depot/projects/bike_sched/sys/modules/geom/geom_part/geom_part_pc98/Makefile#1 branch .. //depot/projects/bike_sched/sys/modules/igb/Makefile#2 integrate .. //depot/projects/bike_sched/sys/modules/ixgbe/Makefile#2 integrate .. //depot/projects/bike_sched/sys/modules/krpc/Makefile#1 branch .. //depot/projects/bike_sched/sys/modules/nfslockd/Makefile#1 branch .. //depot/projects/bike_sched/sys/modules/sound/driver/emu10kx/Makefile#3 integrate .. //depot/projects/bike_sched/sys/modules/uslcom/Makefile#2 integrate .. //depot/projects/bike_sched/sys/modules/wpi/Makefile#2 integrate .. //depot/projects/bike_sched/sys/modules/zfs/Makefile#3 integrate .. //depot/projects/bike_sched/sys/net/bpf_zerocopy.c#2 integrate .. //depot/projects/bike_sched/sys/net/if.h#5 integrate .. //depot/projects/bike_sched/sys/netgraph/ng_base.c#6 integrate .. //depot/projects/bike_sched/sys/netgraph/ng_car.c#3 integrate .. //depot/projects/bike_sched/sys/netgraph/ng_pptpgre.c#4 integrate .. //depot/projects/bike_sched/sys/netncp/ncp_conn.c#4 integrate .. //depot/projects/bike_sched/sys/netsmb/smb_iod.c#5 integrate .. //depot/projects/bike_sched/sys/nlm/nlm_prot_clnt.c#2 integrate .. //depot/projects/bike_sched/sys/nlm/nlm_prot_impl.c#2 integrate .. //depot/projects/bike_sched/sys/nlm/nlm_prot_server.c#2 integrate .. //depot/projects/bike_sched/sys/nlm/nlm_prot_svc.c#2 integrate .. //depot/projects/bike_sched/sys/nlm/nlm_prot_xdr.c#2 integrate .. //depot/projects/bike_sched/sys/nlm/sm_inter_xdr.c#2 integrate .. //depot/projects/bike_sched/sys/pc98/cbus/clock.c#4 integrate .. //depot/projects/bike_sched/sys/pc98/cbus/syscons_cbus.c#4 integrate .. //depot/projects/bike_sched/sys/pc98/conf/GENERIC#6 integrate .. //depot/projects/bike_sched/sys/pc98/conf/NOTES#5 integrate .. //depot/projects/bike_sched/sys/pc98/include/clock.h#2 integrate .. //depot/projects/bike_sched/sys/pc98/include/timerreg.h#2 integrate .. //depot/projects/bike_sched/sys/pci/if_rlreg.h#6 integrate .. //depot/projects/bike_sched/sys/powerpc/aim/clock.c#2 integrate .. //depot/projects/bike_sched/sys/powerpc/booke/clock.c#2 integrate .. //depot/projects/bike_sched/sys/powerpc/conf/GENERIC#5 integrate .. //depot/projects/bike_sched/sys/powerpc/include/clock.h#3 integrate .. //depot/projects/bike_sched/sys/powerpc/include/param.h#2 integrate .. //depot/projects/bike_sched/sys/rpc/auth_unix.c#2 integrate .. //depot/projects/bike_sched/sys/rpc/authunix_prot.c#2 integrate .. //depot/projects/bike_sched/sys/rpc/clnt_dg.c#2 integrate .. //depot/projects/bike_sched/sys/rpc/clnt_rc.c#2 integrate .. //depot/projects/bike_sched/sys/rpc/clnt_vc.c#2 integrate .. //depot/projects/bike_sched/sys/rpc/inet_ntop.c#2 integrate .. //depot/projects/bike_sched/sys/rpc/inet_pton.c#2 integrate .. //depot/projects/bike_sched/sys/rpc/rpc_generic.c#2 integrate .. //depot/projects/bike_sched/sys/rpc/rpcb_clnt.c#2 integrate .. //depot/projects/bike_sched/sys/rpc/svc.c#2 integrate .. //depot/projects/bike_sched/sys/rpc/svc_auth_unix.c#2 integrate .. //depot/projects/bike_sched/sys/rpc/svc_dg.c#2 integrate .. //depot/projects/bike_sched/sys/rpc/svc_generic.c#2 integrate .. //depot/projects/bike_sched/sys/rpc/svc_vc.c#2 integrate .. //depot/projects/bike_sched/sys/security/mac/mac_syscalls.c#3 integrate .. //depot/projects/bike_sched/sys/sparc64/conf/GENERIC#6 integrate .. //depot/projects/bike_sched/sys/sparc64/include/clock.h#3 integrate .. //depot/projects/bike_sched/sys/sparc64/include/param.h#3 integrate .. //depot/projects/bike_sched/sys/sparc64/sparc64/clock.c#2 integrate .. //depot/projects/bike_sched/sys/sun4v/conf/GENERIC#3 integrate .. //depot/projects/bike_sched/sys/sun4v/include/clock.h#2 integrate .. //depot/projects/bike_sched/sys/sun4v/include/param.h#2 integrate .. //depot/projects/bike_sched/sys/sys/aac_ioctl.h#3 integrate .. //depot/projects/bike_sched/sys/sys/buf.h#5 integrate .. //depot/projects/bike_sched/sys/sys/cpuset.h#3 integrate .. //depot/projects/bike_sched/sys/sys/fcntl.h#4 integrate .. //depot/projects/bike_sched/sys/sys/imgact.h#3 integrate .. //depot/projects/bike_sched/sys/sys/lockmgr.h#4 integrate .. //depot/projects/bike_sched/sys/sys/mman.h#3 integrate .. //depot/projects/bike_sched/sys/sys/namei.h#2 integrate .. //depot/projects/bike_sched/sys/sys/param.h#5 integrate .. //depot/projects/bike_sched/sys/sys/stat.h#3 integrate .. //depot/projects/bike_sched/sys/sys/syscall.h#8 integrate .. //depot/projects/bike_sched/sys/sys/syscall.mk#8 integrate .. //depot/projects/bike_sched/sys/sys/syscallsubr.h#6 integrate .. //depot/projects/bike_sched/sys/sys/sysproto.h#8 integrate .. //depot/projects/bike_sched/sys/sys/systm.h#5 integrate .. //depot/projects/bike_sched/sys/sys/time.h#4 integrate .. //depot/projects/bike_sched/sys/sys/vnode.h#5 integrate .. //depot/projects/bike_sched/sys/ufs/ffs/ffs_snapshot.c#5 integrate .. //depot/projects/bike_sched/sys/ufs/ffs/ffs_vfsops.c#6 integrate .. //depot/projects/bike_sched/sys/ufs/ffs/ffs_vnops.c#5 integrate .. //depot/projects/bike_sched/sys/vm/vm_kern.c#4 integrate .. //depot/projects/bike_sched/sys/vm/vm_object.c#4 integrate Differences ... ==== //depot/projects/bike_sched/sys/amd64/amd64/pmap.c#9 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.609 2008/03/23 23:04:09 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.610 2008/03/28 04:29:27 ps Exp $"); /* * Manages physical address maps. @@ -4371,6 +4371,7 @@ if (pdep != NULL && (*pdep & PG_V)) { if (*pdep & PG_PS) { pte = *pdep; + val = MINCORE_SUPER; /* Compute the physical address of the 4KB page. */ pa = ((*pdep & PG_PS_FRAME) | (addr & PDRMASK)) & PG_FRAME; @@ -4385,7 +4386,7 @@ PMAP_UNLOCK(pmap); if (pte != 0) { - val = MINCORE_INCORE; + val |= MINCORE_INCORE; if ((pte & PG_MANAGED) == 0) return val; ==== //depot/projects/bike_sched/sys/amd64/conf/GENERIC#7 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.494 2008/03/05 14:13:29 rink Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.495 2008/03/27 11:54:17 dfr Exp $ cpu HAMMER ident GENERIC @@ -39,6 +39,7 @@ options MD_ROOT # MD is a potential root device options NFSCLIENT # Network Filesystem Client options NFSSERVER # Network Filesystem Server +options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCLIENT options NTFS # NT File System options MSDOSFS # MSDOS Filesystem ==== //depot/projects/bike_sched/sys/amd64/conf/NOTES#6 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.76 2008/03/24 22:23:21 jkim Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.77 2008/03/26 22:11:58 phk Exp $ # # @@ -88,19 +88,6 @@ ##################################################################### # CLOCK OPTIONS -# The following options are used for debugging clock behavior only, and -# should not be used for production systems. - -# CLK_CALIBRATION_LOOP causes clock calibration to be run in a loop at -# startup until the user presses a key. (The i8254 clock is always -# calibrated relative to the RTC (mc146818a) and this option causes the -# calibration to be repeated.) -options CLK_CALIBRATION_LOOP - -# CLK_USE_I8254_CALIBRATION causes the calibrated frequency of the i8254 -# clock to actually be used. -options CLK_USE_I8254_CALIBRATION - # Provide read/write access to the memory in the clock chip. device nvram # Access to rtc cmos via /dev/nvram ==== //depot/projects/bike_sched/sys/amd64/include/clock.h#4 (text+ko) ==== @@ -3,7 +3,7 @@ * Garrett Wollman, September 1994. * This file is in the public domain. * - * $FreeBSD: src/sys/amd64/include/clock.h,v 1.57 2008/03/26 15:03:23 phk Exp $ + * $FreeBSD: src/sys/amd64/include/clock.h,v 1.58 2008/03/26 20:09:18 phk Exp $ */ #ifndef _MACHINE_CLOCK_H_ @@ -27,14 +27,16 @@ * Driver to clock driver interface. */ -int acquire_timer2(int mode); -int release_timer2(void); int rtcin(int reg); void writertc(int reg, unsigned char val); -int sysbeep(int pitch, int period); void init_TSC(void); void init_TSC_tc(void); +#define HAS_TIMER_SPKR 1 +int timer_spkr_acquire(void); +int timer_spkr_release(void); +void timer_spkr_setfreq(int freq); + #endif /* _KERNEL */ #endif /* !_MACHINE_CLOCK_H_ */ ==== //depot/projects/bike_sched/sys/amd64/include/param.h#2 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)param.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/amd64/include/param.h,v 1.20 2006/01/09 06:05:56 imp Exp $ + * $FreeBSD: src/sys/amd64/include/param.h,v 1.21 2008/03/27 05:03:24 jb Exp $ */ /* @@ -79,7 +79,7 @@ #define MACHINE_ARCH "amd64" #endif -#ifdef SMP +#if defined(SMP) || defined(KLD_MODULE) #define MAXCPU 16 #else #define MAXCPU 1 ==== //depot/projects/bike_sched/sys/amd64/include/timerreg.h#2 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/timerreg.h,v 1.2 2005/05/28 13:40:26 nyan Exp $ + * $FreeBSD: src/sys/amd64/include/timerreg.h,v 1.3 2008/03/26 20:09:18 phk Exp $ */ /* @@ -49,17 +49,6 @@ #define TIMER_CNTR2 (IO_TIMER1 + TIMER_REG_CNTR2) #define TIMER_MODE (IO_TIMER1 + TIMER_REG_MODE) -#define timer_spkr_acquire() \ - acquire_timer2(TIMER_SEL2 | TIMER_SQWAVE | TIMER_16BIT) -#define timer_spkr_release() \ - release_timer2() - -#define spkr_set_pitch(pitch) \ - do { \ - outb(TIMER_CNTR2, (pitch) & 0xff); \ - outb(TIMER_CNTR2, (pitch) >> 8); \ - } while(0) - #endif /* _KERNEL */ #endif /* _MACHINE_TIMERREG_H_ */ ==== //depot/projects/bike_sched/sys/amd64/isa/clock.c#5 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.238 2008/03/26 15:03:23 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.241 2008/03/26 22:11:59 phk Exp $"); /* * Routines to handle clock hardware. @@ -53,31 +53,22 @@ #include #include #include -#include -#include #include #include #include #include -#include #include -#include #include -#include #include #include #include #include -#include #include #include -#include #include #include -#include #include -#include #include #include @@ -110,7 +101,6 @@ #define RTC_LOCK mtx_lock_spin(&clock_lock) #define RTC_UNLOCK mtx_unlock_spin(&clock_lock) -static int beeping = 0; static struct mtx clock_lock; static const u_char daysinmonth[] = {31,28,31,30,31,30,31,31,30,31,30,31}; static struct intsrc *i8254_intsrc; @@ -165,9 +155,12 @@ } int -acquire_timer2(int mode) +timer_spkr_acquire(void) { + int mode; + mode = TIMER_SEL2 | TIMER_SQWAVE | TIMER_16BIT; + if (timer2_state != RELEASED) return (-1); timer2_state = ACQUIRED; @@ -180,21 +173,33 @@ * careful with it as with timer0. */ outb(TIMER_MODE, TIMER_SEL2 | (mode & 0x3f)); - + ppi_spkr_on(); /* enable counter2 output to speaker */ return (0); } int -release_timer2() +timer_spkr_release(void) { if (timer2_state != ACQUIRED) return (-1); timer2_state = RELEASED; outb(TIMER_MODE, TIMER_SEL2 | TIMER_SQWAVE | TIMER_16BIT); + ppi_spkr_off(); /* disable counter2 output to speaker */ return (0); } +void +timer_spkr_setfreq(int freq) +{ + + freq = i8254_freq / freq; + mtx_lock_spin(&clock_lock); + outb(TIMER_CNTR2, freq & 0xff); + outb(TIMER_CNTR2, freq >> 8); + mtx_unlock_spin(&clock_lock); +} + /* * This routine receives statistical clock interrupts from the RTC. * As explained above, these occur at 128 interrupts per second. @@ -381,38 +386,6 @@ #endif } -static void -sysbeepstop(void *chan) -{ - ppi_spkr_off(); /* disable counter2 output to speaker */ - timer_spkr_release(); - beeping = 0; -} - -int -sysbeep(int pitch, int period) -{ - int x = splclock(); - - if (timer_spkr_acquire()) - if (!beeping) { - /* Something else owns it. */ - splx(x); - return (-1); /* XXX Should be EBUSY, but nobody cares anyway. */ - } - mtx_lock_spin(&clock_lock); - spkr_set_pitch(pitch); - mtx_unlock_spin(&clock_lock); - if (!beeping) { - /* enable counter2 output to speaker */ - ppi_spkr_on(); - beeping = period; - timeout(sysbeepstop, (void *)NULL, period); - } - splx(x); - return (0); -} - /* * RTC support routines */ @@ -457,86 +430,6 @@ return(bcd2bin(rtcin(port))); } -static u_int -calibrate_clocks(void) -{ - u_int count, prev_count, tot_count; - int sec, start_sec, timeout; - - if (bootverbose) - printf("Calibrating clock(s) ... "); - if (!(rtcin(RTC_STATUSD) & RTCSD_PWR)) - goto fail; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Mar 31 23:32:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E1D591065675; Mon, 31 Mar 2008 23:32:14 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A04221065673 for ; Mon, 31 Mar 2008 23:32:14 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9420F8FC28 for ; Mon, 31 Mar 2008 23:32:14 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2VNWEdO082584 for ; Mon, 31 Mar 2008 23:32:14 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2VNWE9h082582 for perforce@freebsd.org; Mon, 31 Mar 2008 23:32:14 GMT (envelope-from piso@freebsd.org) Date: Mon, 31 Mar 2008 23:32:14 GMT Message-Id: <200803312332.m2VNWE9h082582@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 139106 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 Mar 2008 23:32:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=139106 Change 139106 by piso@piso_newluxor on 2008/03/31 23:31:45 Reassemble fragments before passing it to libalias. While here, do not accept packet coming from L2 in nat action. Not working yet. Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/ip_fw_nat.c#6 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/ip_fw_nat.c#6 (text+ko) ==== @@ -249,13 +249,46 @@ /* XXX - libalias duct tape */ int ldt, retval; + /* ipfw_nat works only at layer 3 */ + if (args->eh != NULL) { + // XXX get out + } + ldt = 0; retval = 0; if ((m = m_pullup(m, sizeof(struct ip))) == NULL) goto badnat; ip = mtod(m, struct ip *); - if (args->eh == NULL) { + if (ip->ip_off & (IP_MF | IP_OFFMASK)) { + struct mbuf *reass = NULL; + + /* Reassemble packet. */ + //reass = ip_reass(m); + + /* + * IP header checksum fixup after reassembly and leave header + * in network byte order. + */ + if (reass != NULL) { + int hlen; + + ip = mtod(reass, struct ip *); + hlen = ip->ip_hl << 2; + ip->ip_len = htons(ip->ip_len); + ip->ip_off = htons(ip->ip_off); + ip->ip_sum = 0; + if (hlen == sizeof(struct ip)) + ip->ip_sum = in_cksum_hdr(ip); + else + ip->ip_sum = in_cksum(reass, hlen); + m = reass; + } else { + printf("fragment found\n"); + m = NULL; + goto badnat; + } + } else { ip->ip_len = htons(ip->ip_len); ip->ip_off = htons(ip->ip_off); } @@ -320,8 +353,11 @@ else retval = LibAliasOut(t->lib, &m, MCLBYTES); - if (retval != PKT_ALIAS_OK && - retval != PKT_ALIAS_FOUND_HEADER_FRAGMENT) { + if (retval != PKT_ALIAS_OK) { + if (retval & + (PKT_ALIAS_FOUND_HEADER_FRAGMENT | + PKT_ALIAS_UNRESOLVED_FRAGMENT)) + printf("fragment in libalias?!?!\n"); // XXX panic?!?! printf("retval: %d", retval); /* XXX - should i add some logging? */ m_free(m); @@ -406,11 +442,8 @@ } ip->ip_len = htons(ip->ip_len); } - - if (args->eh == NULL) { - ip->ip_len = ntohs(ip->ip_len); - ip->ip_off = ntohs(ip->ip_off); - } + ip->ip_len = ntohs(ip->ip_len); + ip->ip_off = ntohs(ip->ip_off); args->m = m; return (IP_FW_NAT); From owner-p4-projects@FreeBSD.ORG Mon Mar 31 23:49:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 911101065685; Mon, 31 Mar 2008 23:49:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4EB38106566C for ; Mon, 31 Mar 2008 23:49:38 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 428AA8FC2E for ; Mon, 31 Mar 2008 23:49:38 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2VNncnb083087 for ; Mon, 31 Mar 2008 23:49:38 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2VNncur083085 for perforce@freebsd.org; Mon, 31 Mar 2008 23:49:38 GMT (envelope-from sam@freebsd.org) Date: Mon, 31 Mar 2008 23:49:38 GMT Message-Id: <200803312349.m2VNncur083085@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 139108 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 Mar 2008 23:49:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=139108 Change 139108 by sam@sam_ebb on 2008/03/31 23:49:20 add ctrl_interface to hostapd config files Affected files ... .. //depot/projects/vap/tools/tools/net80211/scripts/config#3 edit .. //depot/projects/vap/tools/tools/net80211/scripts/setup.updown.wpa#3 edit .. //depot/projects/vap/tools/tools/net80211/scripts/setup.wpa#3 edit .. //depot/projects/vap/tools/tools/net80211/scripts/setup.wpa1.aes#3 edit .. //depot/projects/vap/tools/tools/net80211/scripts/setup.wpa1.tkip#3 edit .. //depot/projects/vap/tools/tools/net80211/scripts/setup.wpa2#3 edit .. //depot/projects/vap/tools/tools/net80211/scripts/setup.wpa2.tkip#3 edit Differences ... ==== //depot/projects/vap/tools/tools/net80211/scripts/config#3 (text+ko) ==== @@ -35,10 +35,12 @@ # default ssid for ap vaps SSID=freebsd-ap +# directory to create files like hostapd.conf +TMPDIR=. + +HOSTAPD_CTRL_INTERFACE=/var/run/hostapd + # applications (may want ../ for wlan test apps) HOSTAPD=/usr/sbin/hostapd WLANWATCH=/usr/local/bin/wlanwatch WLANWDS=/usr/local/bin/wlanwds - -# directory to create files like hostapd.conf -TMPDIR=. ==== //depot/projects/vap/tools/tools/net80211/scripts/setup.updown.wpa#3 (text+ko) ==== @@ -20,6 +20,7 @@ rm -f $conf cat >$1 <$1 <$1 <$1 <$1 <$1 < Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BAF70106566B; Mon, 31 Mar 2008 23:50:39 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7A3141065674 for ; Mon, 31 Mar 2008 23:50:39 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 547CC8FC15 for ; Mon, 31 Mar 2008 23:50:39 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2VNodad083176 for ; Mon, 31 Mar 2008 23:50:39 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2VNodL8083174 for perforce@freebsd.org; Mon, 31 Mar 2008 23:50:39 GMT (envelope-from sam@freebsd.org) Date: Mon, 31 Mar 2008 23:50:39 GMT Message-Id: <200803312350.m2VNodL8083174@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 139109 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 Mar 2008 23:50:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=139109 Change 139109 by sam@sam_ebb on 2008/03/31 23:49:41 setup 2 ap vaps; one open and one w/ wpa1+2 Affected files ... .. //depot/projects/vap/tools/tools/net80211/scripts/setup.mixed#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue Apr 1 14:01:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7D60A1065673; Tue, 1 Apr 2008 14:01:00 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3CDCF1065670 for ; Tue, 1 Apr 2008 14:01:00 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 126DE8FC13 for ; Tue, 1 Apr 2008 14:01:00 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m31E0xcT068055 for ; Tue, 1 Apr 2008 14:00:59 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m31E0x09068053 for perforce@freebsd.org; Tue, 1 Apr 2008 14:00:59 GMT (envelope-from gonzo@FreeBSD.org) Date: Tue, 1 Apr 2008 14:00:59 GMT Message-Id: <200804011400.m31E0x09068053@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 139130 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Apr 2008 14:01:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=139130 Change 139130 by gonzo@gonzo_jeeves on 2008/04/01 14:00:40 o bzero requires string.h Affected files ... .. //depot/projects/mips2-jnpr/src/lib/libthr/arch/mips/mips/pthread_md.c#5 edit Differences ... ==== //depot/projects/mips2-jnpr/src/lib/libthr/arch/mips/mips/pthread_md.c#5 (text+ko) ==== @@ -32,6 +32,7 @@ #include #include #include +#include #include "pthread_md.h" From owner-p4-projects@FreeBSD.ORG Tue Apr 1 17:13:32 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2519D1065675; Tue, 1 Apr 2008 17:13:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D81731065673 for ; Tue, 1 Apr 2008 17:13:31 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C69328FC14 for ; Tue, 1 Apr 2008 17:13:31 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m31HDVlJ089106 for ; Tue, 1 Apr 2008 17:13:31 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m31HDV6O089104 for perforce@freebsd.org; Tue, 1 Apr 2008 17:13:31 GMT (envelope-from sam@freebsd.org) Date: Tue, 1 Apr 2008 17:13:31 GMT Message-Id: <200804011713.m31HDV6O089104@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 139139 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Apr 2008 17:13:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=139139 Change 139139 by sam@sam_ebb on 2008/04/01 17:12:45 fix ability to override settings w/ environ variables Affected files ... .. //depot/projects/vap/tools/tools/net80211/scripts/config#4 edit Differences ... ==== //depot/projects/vap/tools/tools/net80211/scripts/config#4 (text+ko) ==== @@ -30,17 +30,17 @@ #CHANNEL=${1:-6:b} # default WPA passphrase -WPA_PASSPHRASE='I am not a geek' +test -z "$WPA_PASSPHRASE" && WPA_PASSPHRASE='I am not a geek' # default ssid for ap vaps -SSID=freebsd-ap +test -z "$SSID" && SSID=freebsd-ap # directory to create files like hostapd.conf -TMPDIR=. +test -z "$TMPDIR" && TMPDIR=. -HOSTAPD_CTRL_INTERFACE=/var/run/hostapd +test -z "$HOSTAPD_CTRL_INTERFACE" && HOSTAPD_CTRL_INTERFACE=/var/run/hostapd # applications (may want ../ for wlan test apps) -HOSTAPD=/usr/sbin/hostapd -WLANWATCH=/usr/local/bin/wlanwatch -WLANWDS=/usr/local/bin/wlanwds +test -z "$HOSTAPD" && HOSTAPD=/usr/sbin/hostapd +test -z "$WLANWATCH" && WLANWATCH=/usr/local/bin/wlanwatch +test -z "$WLANWDS" && WLANWDS=/usr/local/bin/wlanwds From owner-p4-projects@FreeBSD.ORG Tue Apr 1 17:58:20 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 62CE410656D1; Tue, 1 Apr 2008 17:58:19 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CD20F10656F3 for ; Tue, 1 Apr 2008 17:58:18 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B7ED58FC18 for ; Tue, 1 Apr 2008 17:58:18 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m31HwIPq090964 for ; Tue, 1 Apr 2008 17:58:18 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m31HwIKW090962 for perforce@freebsd.org; Tue, 1 Apr 2008 17:58:18 GMT (envelope-from sam@freebsd.org) Date: Tue, 1 Apr 2008 17:58:18 GMT Message-Id: <200804011758.m31HwIKW090962@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 139141 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Apr 2008 17:58:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=139141 Change 139141 by sam@sam_ebb on 2008/04/01 17:57:43 correct handling of tx-only TKIP keys: copy the appropriate mic key (was previously masked by hostapd marking group keys as tx/rx) Affected files ... .. //depot/projects/vap/sys/dev/ath/if_ath.c#54 edit Differences ... ==== //depot/projects/vap/sys/dev/ath/if_ath.c#54 (text+ko) ==== @@ -2071,7 +2071,7 @@ /* * Room for both TX+RX MIC keys in one key cache * slot, just set key at the first index; the hal - * will handle the reset. + * will handle the rest. */ memcpy(hk->kv_mic, k->wk_rxmic, sizeof(hk->kv_mic)); #if HAL_ABI_VERSION > 0x06052200 @@ -2080,13 +2080,16 @@ KEYPRINTF(sc, k->wk_keyix, hk, mac); return ath_hal_keyset(ah, k->wk_keyix, hk, mac); } - } else if (k->wk_flags & IEEE80211_KEY_XR) { - /* - * TX/RX key goes at first index. - * The hal handles the MIC keys are index+64. - */ - memcpy(hk->kv_mic, k->wk_flags & IEEE80211_KEY_XMIT ? - k->wk_txmic : k->wk_rxmic, sizeof(hk->kv_mic)); + } else if (k->wk_flags & IEEE80211_KEY_XMIT) { +#if HAL_ABI_VERSION > 0x06052200 + memcpy(hk->kv_txmic, k->wk_txmic, sizeof(hk->kv_txmic)); +#else + memcpy(hk->kv_mic, k->wk_mic, sizeof(hk->kv_mic)); +#endif + KEYPRINTF(sc, k->wk_keyix, hk, mac); + return ath_hal_keyset(ah, k->wk_keyix, hk, mac); + } else if (k->wk_flags & IEEE80211_KEY_RECV) { + memcpy(hk->kv_mic, k->wk_rxmic, sizeof(hk->kv_mic)); KEYPRINTF(sc, k->wk_keyix, hk, mac); return ath_hal_keyset(ah, k->wk_keyix, hk, mac); } From owner-p4-projects@FreeBSD.ORG Tue Apr 1 19:01:29 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 426F41065671; Tue, 1 Apr 2008 19:01:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 01D24106566B for ; Tue, 1 Apr 2008 19:01:29 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CB1C78FC1C for ; Tue, 1 Apr 2008 19:01:28 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m31J1S00094279 for ; Tue, 1 Apr 2008 19:01:28 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m31J1SAB094277 for perforce@freebsd.org; Tue, 1 Apr 2008 19:01:28 GMT (envelope-from sam@freebsd.org) Date: Tue, 1 Apr 2008 19:01:28 GMT Message-Id: <200804011901.m31J1SAB094277@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 139147 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Apr 2008 19:01:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=139147 Change 139147 by sam@sam_ebb on 2008/04/01 19:00:55 missing " Affected files ... .. //depot/projects/vap/etc/rc.d/netif#5 edit Differences ... ==== //depot/projects/vap/etc/rc.d/netif#5 (text+ko) ==== @@ -125,7 +125,7 @@ _fail= for ifn in ${_cooked_list}; do if !${_func} ${ifn} $2; then - _fail="${_fail} ${ifn} + _fail="${_fail} ${ifn}" fi done From owner-p4-projects@FreeBSD.ORG Tue Apr 1 19:12:42 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D43ED1065671; Tue, 1 Apr 2008 19:12:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 942F9106564A for ; Tue, 1 Apr 2008 19:12:41 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6964B8FC19 for ; Tue, 1 Apr 2008 19:12:41 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m31JCfjd095690 for ; Tue, 1 Apr 2008 19:12:41 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m31JCf0T095688 for perforce@freebsd.org; Tue, 1 Apr 2008 19:12:41 GMT (envelope-from sam@freebsd.org) Date: Tue, 1 Apr 2008 19:12:41 GMT Message-Id: <200804011912.m31JCf0T095688@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 139148 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Apr 2008 19:12:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=139148 Change 139148 by sam@sam_ebb on 2008/04/01 19:12:11 fix syntax error Affected files ... .. //depot/projects/vap/etc/rc.d/netif#6 edit Differences ... ==== //depot/projects/vap/etc/rc.d/netif#6 (text+ko) ==== @@ -124,7 +124,7 @@ _fail= for ifn in ${_cooked_list}; do - if !${_func} ${ifn} $2; then + if ! ${_func} ${ifn} $2; then _fail="${_fail} ${ifn}" fi done From owner-p4-projects@FreeBSD.ORG Tue Apr 1 19:12:42 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A23151065714; Tue, 1 Apr 2008 19:12:42 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B678B106566C for ; Tue, 1 Apr 2008 19:12:41 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8BD6F8FC26 for ; Tue, 1 Apr 2008 19:12:41 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m31JCf6p095695 for ; Tue, 1 Apr 2008 19:12:41 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m31JCfsx095693 for perforce@freebsd.org; Tue, 1 Apr 2008 19:12:41 GMT (envelope-from sam@freebsd.org) Date: Tue, 1 Apr 2008 19:12:41 GMT Message-Id: <200804011912.m31JCfsx095693@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 139149 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Apr 2008 19:12:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=139149 Change 139149 by sam@sam_ebb on 2008/04/01 19:12:23 missing arg Affected files ... .. //depot/projects/vap/etc/network.subr#5 edit Differences ... ==== //depot/projects/vap/etc/network.subr#5 (text+ko) ==== @@ -522,7 +522,7 @@ i=`ifconfig wlan create ${create_args}` ifconfig $i name $child && cfg=0 fi - ifn_start + ifn_start $child done return From owner-p4-projects@FreeBSD.ORG Tue Apr 1 19:13:43 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 12A431065679; Tue, 1 Apr 2008 19:13:43 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C549D1065674 for ; Tue, 1 Apr 2008 19:13:42 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B4B878FC38 for ; Tue, 1 Apr 2008 19:13:42 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m31JDggw095728 for ; Tue, 1 Apr 2008 19:13:42 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m31JDgfT095726 for perforce@freebsd.org; Tue, 1 Apr 2008 19:13:42 GMT (envelope-from sam@freebsd.org) Date: Tue, 1 Apr 2008 19:13:42 GMT Message-Id: <200804011913.m31JDgfT095726@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 139150 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Apr 2008 19:13:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=139150 Change 139150 by sam@sam_ebb on 2008/04/01 19:13:09 use wlanX as that's the default for programs like wlandebug Affected files ... .. //depot/projects/vap/etc/defaults/rc.conf#7 edit Differences ... ==== //depot/projects/vap/etc/defaults/rc.conf#7 (text+ko) ==== @@ -180,7 +180,7 @@ #ifconfig_lo0_alias0="inet 127.0.0.254 netmask 0xffffffff" # Sample alias entry. #ifconfig_ed0_ipx="ipx 0x00010010" # Sample IPX address family entry. #ifconfig_fxp0_name="net0" # Change interface name from fxp0 to net0. -#vaps_ath0="ath0_main" # VAP interfaces for ath0 device +#vaps_ath0="wlan0" # VAP interfaces for ath0 device #ipv4_addrs_fxp0="192.168.0.1/24 192.168.1.1-5/28" # example IPv4 address entry. # #autobridge_interfaces="bridge0" # List of bridges to check From owner-p4-projects@FreeBSD.ORG Tue Apr 1 19:14:44 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6896D1065674; Tue, 1 Apr 2008 19:14:44 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 281BF106564A for ; Tue, 1 Apr 2008 19:14:44 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F16E38FC2C for ; Tue, 1 Apr 2008 19:14:43 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m31JEhO9095741 for ; Tue, 1 Apr 2008 19:14:43 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m31JEhcA095739 for perforce@freebsd.org; Tue, 1 Apr 2008 19:14:43 GMT (envelope-from rpaulo@FreeBSD.org) Date: Tue, 1 Apr 2008 19:14:43 GMT Message-Id: <200804011914.m31JEhcA095739@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 139151 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Apr 2008 19:14:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=139151 Change 139151 by rpaulo@rpaulo_epsilon on 2008/04/01 19:14:06 Move aird to my namespace. Affected files ... .. //depot/projects/aird/Makefile#2 delete .. //depot/projects/aird/aird.1#2 delete .. //depot/projects/aird/aird.c#2 delete .. //depot/user/rpaulo/aird/Makefile#1 add .. //depot/user/rpaulo/aird/aird.1#1 add .. //depot/user/rpaulo/aird/aird.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue Apr 1 19:32:02 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8CB3E1065674; Tue, 1 Apr 2008 19:32:02 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4C946106566B for ; Tue, 1 Apr 2008 19:32:02 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2226F8FC25 for ; Tue, 1 Apr 2008 19:32:02 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m31JW2tj096334 for ; Tue, 1 Apr 2008 19:32:02 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m31JW1YF096332 for perforce@freebsd.org; Tue, 1 Apr 2008 19:32:01 GMT (envelope-from sam@freebsd.org) Date: Tue, 1 Apr 2008 19:32:01 GMT Message-Id: <200804011932.m31JW1YF096332@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 139153 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Apr 2008 19:32:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=139153 Change 139153 by sam@sam_ebb on 2008/04/01 19:31:07 mark interface UP after any specified cmds are applied to the interface; this is important for parameters that must be applied only when the interface is down but also seems to make more sense Affected files ... .. //depot/projects/vap/etc/network.subr#6 edit Differences ... ==== //depot/projects/vap/etc/network.subr#6 (text+ko) ==== @@ -93,8 +93,8 @@ ifconfig_args=`ifconfig_getargs $1` if [ -n "${ifconfig_args}" ]; then + ifconfig $1 ${ifconfig_args} ifconfig $1 up - ifconfig $1 ${ifconfig_args} _cfg=0 fi From owner-p4-projects@FreeBSD.ORG Tue Apr 1 20:05:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A90E21065671; Tue, 1 Apr 2008 20:05:38 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 68825106566C for ; Tue, 1 Apr 2008 20:05:38 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5806A8FC37 for ; Tue, 1 Apr 2008 20:05:38 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m31K5cqW099231 for ; Tue, 1 Apr 2008 20:05:38 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m31K5c5j099229 for perforce@freebsd.org; Tue, 1 Apr 2008 20:05:38 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 1 Apr 2008 20:05:38 GMT Message-Id: <200804012005.m31K5c5j099229@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 139155 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Apr 2008 20:05:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=139155 Change 139155 by hselasky@hselasky_laptop001 on 2008/04/01 20:05:06 Style change by "usb_style.sh". Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ehci_pci.c#32 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ehci_pci.c#32 (text+ko) ==== @@ -434,12 +434,12 @@ } legsup = eec; if (legsup & EHCI_LEGSUP_BIOSOWNED) { - /* - * Only set the "OSOWNED" bit if the - * "BIOSOWNED" bit is set: + /* + * Only set the "OSOWNED" bit if the "BIOSOWNED" bit + * is set: */ pci_write_config(self, eecp, - legsup | EHCI_LEGSUP_OSOWNED, 4); + legsup | EHCI_LEGSUP_OSOWNED, 4); device_printf(sc->sc_bus.bdev, "waiting for BIOS " "to give up control\n"); From owner-p4-projects@FreeBSD.ORG Tue Apr 1 20:05:39 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 736A710656F1; Tue, 1 Apr 2008 20:05:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8AB7F106566B for ; Tue, 1 Apr 2008 20:05:38 +0000 (UTC) (envelope-from andre@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7A9958FC14 for ; Tue, 1 Apr 2008 20:05:38 +0000 (UTC) (envelope-from andre@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m31K5cZZ099236 for ; Tue, 1 Apr 2008 20:05:38 GMT (envelope-from andre@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m31K5cel099234 for perforce@freebsd.org; Tue, 1 Apr 2008 20:05:38 GMT (envelope-from andre@freebsd.org) Date: Tue, 1 Apr 2008 20:05:38 GMT Message-Id: <200804012005.m31K5cel099234@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andre@freebsd.org using -f From: Andre Oppermann To: Perforce Change Reviews Cc: Subject: PERFORCE change 139156 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Apr 2008 20:05:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=139156 Change 139156 by andre@andre_flirtbox on 2008/04/01 20:05:14 Use #defines for tcp options padding. Affected files ... .. //depot/projects/tcp_reass/netinet/tcp.h#3 edit .. //depot/projects/tcp_reass/netinet/tcp_output.c#4 edit Differences ... ==== //depot/projects/tcp_reass/netinet/tcp.h#3 (text+ko) ==== @@ -78,6 +78,8 @@ #define TCPOPT_EOL 0 #define TCPOLEN_EOL 1 +#define TCPOPT_PAD 0 +#define TCPOLEN_PAD 1 #define TCPOPT_NOP 1 #define TCPOLEN_NOP 1 #define TCPOPT_MAXSEG 2 ==== //depot/projects/tcp_reass/netinet/tcp_output.c#4 (text+ko) ==== @@ -1384,8 +1384,8 @@ * people with padding of EOLs. */ while (optlen % 4) { - optlen += 1; - *optp++ = 0x00; + optlen += TCPOLEN_PAD; + *optp++ = TCPOPT_PAD; } KASSERT(optlen <= TCP_MAXOLEN, ("%s: TCP options too long", __func__)); From owner-p4-projects@FreeBSD.ORG Tue Apr 1 20:15:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E67B61065674; Tue, 1 Apr 2008 20:15:49 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A4FA61065670 for ; Tue, 1 Apr 2008 20:15:49 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 941128FC1A for ; Tue, 1 Apr 2008 20:15:49 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m31KFnoE099558 for ; Tue, 1 Apr 2008 20:15:49 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m31KFnQ3099556 for perforce@freebsd.org; Tue, 1 Apr 2008 20:15:49 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 1 Apr 2008 20:15:49 GMT Message-Id: <200804012015.m31KFnQ3099556@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 139157 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Apr 2008 20:15:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=139157 Change 139157 by hselasky@hselasky_laptop001 on 2008/04/01 20:14:49 The "usbd_bus_mem_alloc_all()" function now initialises the "bus_dma_tag_t" typed field that once was in "struct usbd_bus". The reason for this change is that the initial field was moved into another structure. Factor out this initialisation to save future code updates. Affected files ... .. //depot/projects/usb/src/sys/arm/at91/at91_udp.c#6 edit .. //depot/projects/usb/src/sys/dev/usb/ehci_pci.c#33 edit .. //depot/projects/usb/src/sys/dev/usb/ohci_pci.c#29 edit .. //depot/projects/usb/src/sys/dev/usb/uhci_pci.c#29 edit .. //depot/projects/usb/src/sys/dev/usb/uss820_dci_pccard.c#2 edit Differences ... ==== //depot/projects/usb/src/sys/arm/at91/at91_udp.c#6 (text+ko) ==== @@ -141,7 +141,6 @@ } /* setup AT9100 USB device controller interface softc */ - sc->sc_dci.sc_bus.dma_tag_parent = device_get_dma_tag(dev); sc->sc_dci.sc_clocks_on = &at91_udp_clocks_on; sc->sc_dci.sc_clocks_off = &at91_udp_clocks_off; sc->sc_dci.sc_clocks_arg = sc; @@ -151,7 +150,8 @@ /* get all DMA memory */ - if (usbd_bus_mem_alloc_all(&(sc->sc_dci.sc_bus), NULL)) { + if (usbd_bus_mem_alloc_all(&(sc->sc_dci.sc_bus), + device_get_dma_tag(dev), NULL)) { return (ENOMEM); } /* ==== //depot/projects/usb/src/sys/dev/usb/ehci_pci.c#33 (text+ko) ==== @@ -219,13 +219,10 @@ device_printf(self, "Could not allocate sc\n"); return (ENXIO); } - /* store parent DMA tag */ - - sc->sc_bus.dma_tag_parent = device_get_dma_tag(self); - /* get all DMA memory */ - if (usbd_bus_mem_alloc_all(&(sc->sc_bus), &ehci_iterate_hw_softc)) { + if (usbd_bus_mem_alloc_all(&(sc->sc_bus), + device_get_dma_tag(self), &ehci_iterate_hw_softc)) { return ENOMEM; } sc->sc_dev = self; ==== //depot/projects/usb/src/sys/dev/usb/ohci_pci.c#29 (text+ko) ==== @@ -196,13 +196,10 @@ device_printf(self, "Could not allocate sc\n"); return (ENXIO); } - /* store parent DMA tag */ - - sc->sc_bus.dma_tag_parent = device_get_dma_tag(self); - /* get all DMA memory */ - if (usbd_bus_mem_alloc_all(&(sc->sc_bus), &ohci_iterate_hw_softc)) { + if (usbd_bus_mem_alloc_all(&(sc->sc_bus), device_get_dma_tag(self), + &ohci_iterate_hw_softc)) { return ENOMEM; } sc->sc_dev = self; ==== //depot/projects/usb/src/sys/dev/usb/uhci_pci.c#29 (text+ko) ==== @@ -224,13 +224,10 @@ device_printf(self, "Could not allocate sc\n"); return (ENXIO); } - /* store parent DMA tag */ - - sc->sc_bus.dma_tag_parent = device_get_dma_tag(self); - /* get all DMA memory */ - if (usbd_bus_mem_alloc_all(&(sc->sc_bus), &uhci_iterate_hw_softc)) { + if (usbd_bus_mem_alloc_all(&(sc->sc_bus), device_get_dma_tag(self), + &uhci_iterate_hw_softc)) { return ENOMEM; } sc->sc_dev = self; ==== //depot/projects/usb/src/sys/dev/usb/uss820_dci_pccard.c#2 (text+ko) ==== @@ -154,11 +154,10 @@ if (sc == NULL) { return (ENXIO); } - sc->sc_bus.dma_tag_parent = device_get_dma_tag(dev); - /* get all DMA memory */ - if (usbd_bus_mem_alloc_all(&(sc->sc_bus), NULL)) { + if (usbd_bus_mem_alloc_all(&(sc->sc_bus), + device_get_dma_tag(dev), NULL)) { return (ENOMEM); } rid = 0; From owner-p4-projects@FreeBSD.ORG Tue Apr 1 20:17:56 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 001FC1065675; Tue, 1 Apr 2008 20:17:55 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B38FB1065672 for ; Tue, 1 Apr 2008 20:17:55 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 88C5C8FC16 for ; Tue, 1 Apr 2008 20:17:55 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m31KHtli099612 for ; Tue, 1 Apr 2008 20:17:55 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m31KHt2F099610 for perforce@freebsd.org; Tue, 1 Apr 2008 20:17:55 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 1 Apr 2008 20:17:55 GMT Message-Id: <200804012017.m31KHt2F099610@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 139158 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Apr 2008 20:17:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=139158 Change 139158 by hselasky@hselasky_laptop001 on 2008/04/01 20:17:31 Include "sys/condvar.h" by default, hence the "struct cv" will be used in some frequently used USB structures. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_port.h#26 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_port.h#26 (text+ko) ==== @@ -61,6 +61,7 @@ #include #include #include +#include #include #include #include /* SYSCTL_XXX() */ From owner-p4-projects@FreeBSD.ORG Tue Apr 1 20:20:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 325AF106567D; Tue, 1 Apr 2008 20:20:59 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E50A21065679 for ; Tue, 1 Apr 2008 20:20:58 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D4E078FC36 for ; Tue, 1 Apr 2008 20:20:58 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m31KKwHd099736 for ; Tue, 1 Apr 2008 20:20:58 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m31KKw5P099734 for perforce@freebsd.org; Tue, 1 Apr 2008 20:20:58 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 1 Apr 2008 20:20:58 GMT Message-Id: <200804012020.m31KKw5P099734@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 139159 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Apr 2008 20:20:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=139159 Change 139159 by hselasky@hselasky_laptop001 on 2008/04/01 20:20:47 I have replaced a field in the USB page cache. Update the code that depended on this field, "pc->xfer". Affected files ... .. //depot/projects/usb/src/sys/dev/usb/at9100_dci.c#15 edit .. //depot/projects/usb/src/sys/dev/usb/uss820_dci.c#10 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/at9100_dci.c#15 (text+ko) ==== @@ -65,6 +65,9 @@ ((struct at9100_dci_softc *)(((uint8_t *)(bus)) - \ POINTER_TO_UNSIGNED(&(((struct at9100_dci_softc *)0)->sc_bus)))) +#define AT9100_DCI_PC2SC(pc) \ + AT9100_DCI_BUS2SC((pc)->tag_parent->info->bus) + #ifdef USB_DEBUG #define DPRINTFN(n,fmt,...) do { \ if (at9100_dcidebug > (n)) { \ @@ -367,7 +370,7 @@ td->remainder = 0; /* get pointer to softc */ - sc = td->pc->xfer->usb_sc; + sc = AT9100_DCI_PC2SC(td->pc); /* sneak peek the set address */ if ((req.bmRequestType == UT_WRITE_DEVICE) && @@ -649,7 +652,7 @@ if (!(csr & AT91_UDP_CSR_TXCOMP)) { goto not_complete; } - sc = td->pc->xfer->usb_sc; + sc = AT9100_DCI_PC2SC(td->pc); if (sc->sc_dv_addr != 0xFF) { /* * The AT91 has a special requirement with regard to ==== //depot/projects/usb/src/sys/dev/usb/uss820_dci.c#10 (text+ko) ==== @@ -51,6 +51,9 @@ ((struct uss820_dci_softc *)(((uint8_t *)(bus)) - \ POINTER_TO_UNSIGNED(&(((struct uss820_dci_softc *)0)->sc_bus)))) +#define USS820_DCI_PC2SC(pc) \ + USS820_DCI_BUS2SC((pc)->tag_parent->info->bus) + #ifdef USB_DEBUG #define DPRINTFN(n,fmt,...) do { \ if (uss820_dcidebug > (n)) { \ @@ -271,7 +274,7 @@ td->rx_stat_reg); /* get pointer to softc */ - sc = td->pc->xfer->usb_sc; + sc = USS820_DCI_PC2SC(td->pc); DPRINTFN(4, "rx_stat=0x%02x rem=%u\n", rx_stat, td->remainder); @@ -432,7 +435,7 @@ /* read out EPCON register */ /* enable RX input */ if (!td->did_stall) { - uss820_dci_update_shared_1(td->pc->xfer->usb_sc, + uss820_dci_update_shared_1(USS820_DCI_PC2SC(td->pc), USS820_EPCON, 0xFF, USS820_EPCON_RXIE); td->did_stall = 1; } @@ -595,7 +598,7 @@ * data into the FIFO. This is undocumented. */ if (!td->did_stall) { - uss820_dci_update_shared_1(td->pc->xfer->usb_sc, + uss820_dci_update_shared_1(USS820_DCI_PC2SC(td->pc), USS820_EPCON, 0xFF, USS820_EPCON_TXOE); td->did_stall = 1; } @@ -652,7 +655,7 @@ USS820_TXFLG_TXFIF1)) { return (1); /* not complete */ } - sc = td->pc->xfer->usb_sc; + sc = USS820_DCI_PC2SC(td->pc); if (sc->sc_dv_addr != 0xFF) { /* write function address */ uss820_dci_set_address(sc, sc->sc_dv_addr); From owner-p4-projects@FreeBSD.ORG Tue Apr 1 20:35:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4012D1065670; Tue, 1 Apr 2008 20:35:14 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F33A7106564A for ; Tue, 1 Apr 2008 20:35:13 +0000 (UTC) (envelope-from andre@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E34008FC27 for ; Tue, 1 Apr 2008 20:35:13 +0000 (UTC) (envelope-from andre@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m31KZDLF000334 for ; Tue, 1 Apr 2008 20:35:13 GMT (envelope-from andre@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m31KZD32000332 for perforce@freebsd.org; Tue, 1 Apr 2008 20:35:13 GMT (envelope-from andre@freebsd.org) Date: Tue, 1 Apr 2008 20:35:13 GMT Message-Id: <200804012035.m31KZD32000332@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andre@freebsd.org using -f From: Andre Oppermann To: Perforce Change Reviews Cc: Subject: PERFORCE change 139160 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Apr 2008 20:35:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=139160 Change 139160 by andre@andre_flirtbox on 2008/04/01 20:34:28 The order of the TCP options was changed and some assumptions of tcp_addoptions() no longer hold true. Add a test for all options preventing overflows. Affected files ... .. //depot/projects/tcp_reass/netinet/tcp.h#4 edit .. //depot/projects/tcp_reass/netinet/tcp_output.c#5 edit .. //depot/projects/tcp_reass/netinet/tcp_var.h#10 edit Differences ... ==== //depot/projects/tcp_reass/netinet/tcp.h#4 (text+ko) ==== ==== //depot/projects/tcp_reass/netinet/tcp_output.c#5 (text+ko) ==== @@ -1279,12 +1279,16 @@ for (mask = 1; mask < TOF_MAXOPT; mask <<= 1) { if ((to->to_flags & mask) != mask) continue; + if (optlen == TCP_MAXOLEN) + break; switch (to->to_flags & mask) { case TOF_MSS: while (optlen % 4) { optlen += TCPOLEN_NOP; *optp++ = TCPOPT_NOP; } + if (TCP_MAXOLEN - optlen < TCPOLEN_MAXSEG) + continue; optlen += TCPOLEN_MAXSEG; *optp++ = TCPOPT_MAXSEG; *optp++ = TCPOLEN_MAXSEG; @@ -1297,6 +1301,8 @@ optlen += TCPOLEN_NOP; *optp++ = TCPOPT_NOP; } + if (TCP_MAXOLEN - optlen < TCPOLEN_WINDOW) + continue; optlen += TCPOLEN_WINDOW; *optp++ = TCPOPT_WINDOW; *optp++ = TCPOLEN_WINDOW; @@ -1307,6 +1313,8 @@ optlen += TCPOLEN_NOP; *optp++ = TCPOPT_NOP; } + if (TCP_MAXOLEN - optlen < TCPOLEN_SACK_PERMITTED) + continue; optlen += TCPOLEN_SACK_PERMITTED; *optp++ = TCPOPT_SACK_PERMITTED; *optp++ = TCPOLEN_SACK_PERMITTED; @@ -1316,6 +1324,8 @@ optlen += TCPOLEN_NOP; *optp++ = TCPOPT_NOP; } + if (TCP_MAXOLEN - optlen < TCPOLEN_TIMESTAMP) + continue; optlen += TCPOLEN_TIMESTAMP; *optp++ = TCPOPT_TIMESTAMP; *optp++ = TCPOLEN_TIMESTAMP; @@ -1352,7 +1362,7 @@ optlen += TCPOLEN_NOP; *optp++ = TCPOPT_NOP; } - if (TCP_MAXOLEN - optlen < 2 + TCPOLEN_SACK) + if (TCP_MAXOLEN - optlen < TCPOLEN_SACKHDR + TCPOLEN_SACK) continue; optlen += TCPOLEN_SACKHDR; *optp++ = TCPOPT_SACK; ==== //depot/projects/tcp_reass/netinet/tcp_var.h#10 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Tue Apr 1 20:36:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 95B621065670; Tue, 1 Apr 2008 20:36:15 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5451F1065674 for ; Tue, 1 Apr 2008 20:36:15 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 437188FC1D for ; Tue, 1 Apr 2008 20:36:15 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m31KaFk2000397 for ; Tue, 1 Apr 2008 20:36:15 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m31KaE9b000395 for perforce@freebsd.org; Tue, 1 Apr 2008 20:36:14 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 1 Apr 2008 20:36:14 GMT Message-Id: <200804012036.m31KaE9b000395@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 139161 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Apr 2008 20:36:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=139161 Change 139161 by hselasky@hselasky_laptop001 on 2008/04/01 20:35:25 To solve the following three problems I have to make a set of BUS-DMA related changes. Commit 1/3 P1) I should pass a valid lock function to "bus_dma_tag_create". P2) Currently the error code EINPROGRESS is not handled at all, when returned by "bus_dmamap_load". I have created a new condition variable that will be used to wait for the done callback. P3) Ensure that all USB page caches on an USB transfer are loaded in serial, mostly in case of page bouncing. Changes in "usb_subr.h" from the top: 1) In the USB page cache structure we no have "tag_parent" instead of "xfer". This allows the page cache consept to easily be extended beyond USB. 2) New structure "struct usbd_dma_parent_tag" that is associated with an array of "struct usbd_dma_tag". One purpose of this structure is to store constant parameters that were previously passed on the stack. 3) Several protypes have been updated to take advantage of 2) 4) New function: "usbd_dma_tag_find" which replaces "usbd_dma_tag_setup". 5) "usbd_bdma_done_event" is now a static function. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#101 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.h#101 (text+ko) ==== @@ -122,6 +122,8 @@ struct usbd_bus; struct usbd_clone; struct usbd_config; +struct usbd_dma_tag; +struct usbd_dma_parent_tag; struct usbd_device; struct usbd_hw_ep_profile; struct usbd_interface; @@ -317,7 +319,7 @@ bus_dma_segment_t *p_seg; #endif struct usbd_page *page_start; - struct usbd_xfer *xfer; /* if set, backpointer to USB transfer */ + struct usbd_dma_parent_tag *tag_parent; /* always set */ void *buffer; /* virtual buffer pointer */ #ifdef __NetBSD__ int n_seg; @@ -406,13 +408,39 @@ }; /* - * The following structure keeps an USB DMA tag. + * The following typedef defines the USB DMA load done callback. + */ + +typedef void (usbd_dma_callback_t)(struct usbd_dma_parent_tag *udpt); + +/* + * The following structure describes the parent USB DMA tag. + */ +struct usbd_dma_parent_tag { + struct cv cv[1]; /* internal condition variable */ + + bus_dma_tag_t tag; /* always set */ + + struct mtx *mtx; /* private mutex, always set */ + struct usbd_memory_info *info; /* used by the callback function */ + usbd_dma_callback_t *func; /* load complete callback function */ + struct usbd_dma_tag *utag_first;/* pointer to first USB DMA tag */ + + uint8_t dma_error; /* set if DMA load operation failed */ + uint8_t dma_bits; /* number of DMA address lines */ + uint8_t utag_max; /* number of USB DMA tags */ +}; + +/* + * The following structure describes an USB DMA tag. */ struct usbd_dma_tag { #ifdef __NetBSD__ bus_dma_segment_t *p_seg; #endif + struct usbd_dma_parent_tag *tag_parent; bus_dma_tag_t tag; + uint32_t align; uint32_t size; #ifdef __NetBSD__ @@ -457,8 +485,8 @@ device_t bdev; /* filled by HC driver */ + struct usbd_dma_parent_tag dma_parent_tag[1]; struct usbd_dma_tag dma_tags[USB_BUS_DMA_TAG_MAX]; - bus_dma_tag_t dma_tag_parent; eventhandler_tag usb_clone_tag; struct usbd_bus_methods *methods; /* filled by HC driver */ @@ -783,6 +811,7 @@ struct usbd_memory_info { LIST_HEAD(, usbd_xfer) dma_head; LIST_HEAD(, usbd_xfer) done_head; + struct usbd_dma_parent_tag dma_parent_tag; struct proc *done_thread; void *memory_base; @@ -793,18 +822,21 @@ struct usbd_page_cache *xfer_page_cache_start; struct usbd_page_cache *xfer_page_cache_end; struct usbd_xfer *dma_curr_xfer; - struct usbd_dma_tag *dma_tag_p; struct usbd_bus *bus; uint32_t memory_size; uint32_t memory_refcount; uint32_t setup_refcount; uint32_t page_size; - uint32_t dma_refcount; + uint32_t dma_nframes; /* number of page caches to load */ + uint32_t dma_currframe; /* currect page cache number */ + uint32_t dma_frlength_0; /* length of page cache zero */ uint8_t dma_error; /* set if virtual memory could not be * loaded */ - uint8_t dma_tag_max; + uint8_t dma_refcount; /* set if we are waiting for a + * callback */ + uint8_t done_sleep; /* set if done thread is sleeping */ }; @@ -1019,9 +1051,9 @@ int usbd_uiomove(struct usbd_page_cache *pc, struct uio *uio, uint32_t pc_offset, uint32_t len); void usbd_copy_out(struct usbd_page_cache *cache, uint32_t offset, void *ptr, uint32_t len); void usbd_bzero(struct usbd_page_cache *cache, uint32_t offset, uint32_t len); -void usbd_dma_tag_create(bus_dma_tag_t tag_parent, struct usbd_dma_tag *udt, uint32_t size, uint32_t align); +void usbd_dma_tag_create(struct usbd_dma_tag *udt, uint32_t size, uint32_t align); void usbd_dma_tag_destroy(struct usbd_dma_tag *udt); -uint8_t usbd_pc_alloc_mem(bus_dma_tag_t parent_tag, struct usbd_dma_tag *utag, struct usbd_page_cache *pc, struct usbd_page *pg, uint32_t size, uint32_t align, uint8_t utag_max); +uint8_t usbd_pc_alloc_mem(struct usbd_page_cache *pc, struct usbd_page *pg, uint32_t size, uint32_t align); void usbd_pc_free_mem(struct usbd_page_cache *pc); void usbd_pc_load_mem(struct usbd_page_cache *pc, uint32_t size); void usbd_pc_cpu_invalidate(struct usbd_page_cache *pc); @@ -1040,10 +1072,11 @@ struct mbuf *usbd_ether_get_mbuf(void); int32_t device_delete_all_children(device_t dev); uint16_t usbd_isoc_time_expand(struct usbd_bus *bus, uint16_t isoc_time_curr); -struct usbd_dma_tag *usbd_dma_tag_setup(bus_dma_tag_t tag_parent, struct usbd_dma_tag *udt, uint32_t size, uint32_t align, uint8_t nudt); -void usbd_dma_tag_unsetup(struct usbd_dma_tag *udt, uint8_t nudt); +void usbd_dma_tag_setup(struct usbd_dma_parent_tag *udpt, struct usbd_dma_tag *udt, bus_dma_tag_t dmat, struct mtx *mtx, usbd_dma_callback_t *func, struct usbd_memory_info *info, uint8_t ndmabits, uint8_t nudt); +struct usbd_dma_tag *usbd_dma_tag_find(struct usbd_dma_parent_tag *updt, uint32_t size, uint32_t align); +void usbd_dma_tag_unsetup(struct usbd_dma_parent_tag *udpt); void usbd_bus_mem_flush_all(struct usbd_bus *bus, usbd_bus_mem_cb_t *cb); -uint8_t usbd_bus_mem_alloc_all(struct usbd_bus *bus, usbd_bus_mem_cb_t *cb); +uint8_t usbd_bus_mem_alloc_all(struct usbd_bus *bus, bus_dma_tag_t dmat, usbd_bus_mem_cb_t *cb); void usbd_bus_mem_free_all(struct usbd_bus *bus, usbd_bus_mem_cb_t *cb); uint8_t usbd_transfer_setup_sub_malloc(struct usbd_setup_params *parm, struct usbd_page_search *info, struct usbd_page_cache **ppc, uint32_t size, uint32_t align); struct usbd_device *usbd_bus_port_get_device(struct usbd_bus *bus, struct usbd_port *up); @@ -1094,7 +1127,6 @@ void usbd_transfer_unsetup(struct usbd_xfer **pxfer, uint16_t n_setup); void usbd_std_root_transfer(struct usbd_std_root_transfer *std, usbd_std_root_transfer_func_t *func); void usbd_start_hardware(struct usbd_xfer *xfer); -void usbd_bdma_done_event(struct usbd_memory_info *info); void usbd_bdma_pre_sync(struct usbd_xfer *xfer); void usbd_bdma_post_sync(struct usbd_xfer *xfer); void usbd_transfer_start(struct usbd_xfer *xfer); From owner-p4-projects@FreeBSD.ORG Tue Apr 1 21:02:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 15E771065671; Tue, 1 Apr 2008 21:02:46 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C961D1065675 for ; Tue, 1 Apr 2008 21:02:45 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B84158FC18 for ; Tue, 1 Apr 2008 21:02:45 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m31L2jA7010488 for ; Tue, 1 Apr 2008 21:02:45 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m31L2jkw010486 for perforce@freebsd.org; Tue, 1 Apr 2008 21:02:45 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 1 Apr 2008 21:02:45 GMT Message-Id: <200804012102.m31L2jkw010486@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 139164 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Apr 2008 21:02:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=139164 Change 139164 by hselasky@hselasky_laptop001 on 2008/04/01 21:02:19 To solve the following three problems I have to make a set of BUS-DMA related changes. Commit 2/3 P1) I should pass a valid lock function to "bus_dma_tag_create". P2) Currently the error code EINPROGRESS is not handled at all, when returned by "bus_dmamap_load". I have created a new condition variable that will be used to wait for the done callback. P3) Ensure that all USB page caches on an USB transfer are loaded in serial, mostly in case of page bouncing. Changes in "usb_subr.c" from the top: 1) Create new function that solves P1. 2) Some changes in "usbd_pc_common_mem_cb" to separate the two different use cases: 2a) We are loaded kernel virtual memory into DMA through "usbd_pc_load_mem". 2b) We are loading a BUS-DMA buffer into DMA through "usbd_pc_alloc_mem". 3) "usbd_dma_tag_setup" has changed name to "usbd_dma_tag_find" and now take 3 arguments instead of 5. Functionality is the same. 4) Some changes here and there because some function parameters have moved into new structures. 5) Handle the "EINPROGRESS" case when returned by "bus_dmamap_load()" (P2). 6) "usbd_pc_load_mem()" now calls the done callback in case "size == 0", hence we removed the direct "dma_refcount" increment to make the function more generally available to non-USB drivers. 7) The NetBSD BUS-DMA implementation has not been completly updated and is probably a bit broken. 8) New function "usbd_dma_tag_setup". Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#102 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.c#102 (text+ko) ==== @@ -88,12 +88,15 @@ static void usbd_suspend_resume_sub(struct usbd_device *udev, device_t dev, uint8_t do_suspend); #ifdef __FreeBSD__ +static void usbd_dma_lock_cb(void *arg, bus_dma_lock_op_t op); static int32_t usbd_m_copy_in_cb(void *arg, void *src, uint32_t count); static void usbd_pc_alloc_mem_cb(void *arg, bus_dma_segment_t *segs, int nseg, int error); +static void usbd_pc_load_mem_cb(void *arg, bus_dma_segment_t *segs, int nseg, int error); +static void usbd_pc_common_mem_cb(void *arg, bus_dma_segment_t *segs, int nseg, int error, uint8_t isload); #else static int32_t usbd_m_copy_in_cb(void *arg, caddr_t src, uint32_t count); -static void usbd_pc_alloc_mem_cb(struct usbd_page_cache *pc, bus_dma_segment_t *segs, int nseg, int error); +static void usbd_pc_common_mem_cb(struct usbd_page_cache *pc, bus_dma_segment_t *segs, int nseg, int error, uint8_t isload); #endif static void usbd_config_td_thread(void *arg);; @@ -2519,19 +2522,29 @@ #ifdef __FreeBSD__ /*------------------------------------------------------------------------* + * usbd_dma_lock_cb - dummy callback + *------------------------------------------------------------------------*/ +static void +usbd_dma_lock_cb(void *arg, bus_dma_lock_op_t op) +{ + /* we use "mtx_owned()" instead of this function */ + return; +} + +/*------------------------------------------------------------------------* * usbd_dma_tag_create - allocate a DMA tag * * NOTE: If the "align" parameter has a value of 1 the DMA-tag will * allow multi-segment mappings. Else all mappings are single-segment. *------------------------------------------------------------------------*/ void -usbd_dma_tag_create(bus_dma_tag_t tag_parent, struct usbd_dma_tag *udt, +usbd_dma_tag_create(struct usbd_dma_tag *udt, uint32_t size, uint32_t align) { bus_dma_tag_t tag; if (bus_dma_tag_create - ( /* parent */ tag_parent, + ( /* parent */ udt->tag_parent->tag, /* alignment */ align, /* boundary */ 0, /* lowaddr */ BUS_SPACE_MAXADDR_32BIT, @@ -2544,8 +2557,8 @@ /* maxsegsz */ (align == 1) ? USB_PAGE_SIZE : size, /* flags */ 0, - /* lock */ NULL, - /* */ NULL, + /* lockfn */ &usbd_dma_lock_cb, + /* lockarg */ NULL, &tag)) { tag = NULL; } @@ -2570,7 +2583,29 @@ usbd_pc_alloc_mem_cb(void *arg, bus_dma_segment_t *segs, int nseg, int error) { - struct usbd_xfer *xfer; + usbd_pc_common_mem_cb(arg, segs, nseg, error, 0); + return; +} + +/*------------------------------------------------------------------------* + * usbd_pc_load_mem_cb - BUS-DMA callback function + *------------------------------------------------------------------------*/ +static void +usbd_pc_load_mem_cb(void *arg, bus_dma_segment_t *segs, + int nseg, int error) +{ + usbd_pc_common_mem_cb(arg, segs, nseg, error, 1); + return; +} + +/*------------------------------------------------------------------------* + * usbd_pc_common_mem_cb - BUS-DMA callback function + *------------------------------------------------------------------------*/ +static void +usbd_pc_common_mem_cb(void *arg, bus_dma_segment_t *segs, + int nseg, int error, uint8_t isload) +{ + struct usbd_dma_parent_tag *uptag; struct usbd_page_cache *pc; struct usbd_page *pg; uint32_t rem; @@ -2578,7 +2613,7 @@ uint8_t ext_seg; /* extend last segment */ pc = arg; - xfer = pc->xfer; + uptag = pc->tag_parent; /* * XXX There is sometimes recursive locking here. @@ -2588,16 +2623,7 @@ */ if (error) { - if (xfer) { - owned = mtx_owned(xfer->priv_mtx); - if (!owned) - mtx_lock(xfer->priv_mtx); - xfer->usb_root->dma_error = 1; - usbd_bdma_done_event(xfer->usb_root); - if (!owned) - mtx_unlock(xfer->priv_mtx); - } - return; + goto done; } pg = pc->page_start; pg->physaddr = segs->ds_addr & ~(USB_PAGE_SIZE - 1); @@ -2627,14 +2653,19 @@ if (ext_seg && pc->ismultiseg) { (pg + 1)->physaddr = pg->physaddr + USB_PAGE_SIZE; } - if (xfer) { - owned = mtx_owned(xfer->priv_mtx); - if (!owned) - mtx_lock(xfer->priv_mtx); - usbd_bdma_done_event(xfer->usb_root); - if (!owned) - mtx_unlock(xfer->priv_mtx); +done: + owned = mtx_owned(uptag->mtx); + if (!owned) + mtx_lock(uptag->mtx); + + uptag->dma_error = (error ? 1 : 0); + if (isload) { + (uptag->func) (uptag); + } else { + cv_broadcast(uptag->cv); } + if (!owned) + mtx_unlock(uptag->mtx); return; } @@ -2646,13 +2677,16 @@ * Else: Failure *------------------------------------------------------------------------*/ uint8_t -usbd_pc_alloc_mem(bus_dma_tag_t parent_tag, struct usbd_dma_tag *utag, - struct usbd_page_cache *pc, struct usbd_page *pg, uint32_t size, - uint32_t align, uint8_t utag_max) +usbd_pc_alloc_mem(struct usbd_page_cache *pc, struct usbd_page *pg, + uint32_t size, uint32_t align) { - bus_dma_tag_t tag; + struct usbd_dma_parent_tag *uptag; + struct usbd_dma_tag *utag; bus_dmamap_t map; void *ptr; + int err; + + uptag = pc->tag_parent; if (align != 1) { /* @@ -2689,16 +2723,13 @@ #endif } /* get the correct DMA tag */ - utag = usbd_dma_tag_setup(parent_tag, utag, size, align, utag_max); + utag = usbd_dma_tag_find(uptag, size, align); if (utag == NULL) { goto error; } - /* get the DMA tag */ - tag = utag->tag; - /* allocate memory */ - if (bus_dmamem_alloc - (tag, &ptr, (BUS_DMA_WAITOK | BUS_DMA_COHERENT), &map)) { + if (bus_dmamem_alloc( + utag->tag, &ptr, (BUS_DMA_WAITOK | BUS_DMA_COHERENT), &map)) { goto error; } /* setup page cache */ @@ -2707,14 +2738,24 @@ pc->page_offset_buf = 0; pc->page_offset_end = size; pc->map = map; - pc->tag = tag; + pc->tag = utag->tag; pc->ismultiseg = (align == 1); + mtx_lock(uptag->mtx); + /* load memory into DMA */ - if (bus_dmamap_load - (tag, map, ptr, size, &usbd_pc_alloc_mem_cb, - pc, (BUS_DMA_WAITOK | BUS_DMA_COHERENT))) { - bus_dmamem_free(tag, ptr, map); + err = bus_dmamap_load( + utag->tag, map, ptr, size, &usbd_pc_alloc_mem_cb, + pc, (BUS_DMA_WAITOK | BUS_DMA_COHERENT)); + + if (err == EINPROGRESS) { + cv_wait(uptag->cv, uptag->mtx); + err = 0; + } + mtx_unlock(uptag->mtx); + + if (err || uptag->dma_error) { + bus_dmamem_free(utag->tag, ptr, map); goto error; } bzero(ptr, size); @@ -2759,25 +2800,31 @@ void usbd_pc_load_mem(struct usbd_page_cache *pc, uint32_t size) { - /* sanity check */ - if (pc->xfer == NULL) { - panic("This page cache is not loadable!\n"); - return; - } /* setup page cache */ pc->page_offset_buf = 0; pc->page_offset_end = size; pc->ismultiseg = 1; + mtx_assert(pc->tag_parent->mtx, MA_OWNED); + if (size > 0) { - pc->xfer->usb_root->dma_refcount++; - - /* try to load memory into DMA */ + /* + * Try to load memory into DMA and wait for the callback to + * be called in all cases: + */ if (bus_dmamap_load( pc->tag, pc->map, pc->buffer, size, - &usbd_pc_alloc_mem_cb, pc, 0)) { + &usbd_pc_load_mem_cb, pc, BUS_DMA_WAITOK)) { } + } else { + + /* + * Call callback so that refcount is decremented + * properly: + */ + pc->tag_parent->dma_error = 0; + (pc->tag_parent->func) (pc->tag_parent); } return; } @@ -2816,28 +2863,23 @@ { struct usbd_memory_info *info; struct usbd_dma_tag *utag; - bus_dma_tag_t tag; + + /* get info */ + info = pc->tag_parent->info; /* sanity check */ - if (pc->xfer == NULL) { + if (info == NULL) { goto error; } - info = pc->xfer->usb_root; - tag = pc->xfer->udev->bus->dma_tag_parent; - - utag = usbd_dma_tag_setup(tag, info->dma_tag_p, - size, 1, info->dma_tag_max); + utag = usbd_dma_tag_find(pc->tag_parent, size, 1); if (utag == NULL) { goto error; } - /* get the DMA tag */ - tag = utag->tag; - /* create DMA map */ - if (bus_dmamap_create(tag, 0, &(pc->map))) { + if (bus_dmamap_create(utag->tag, 0, &(pc->map))) { goto error; } - pc->tag = tag; + pc->tag = utag->tag; return 0; /* success */ error: @@ -2873,7 +2915,7 @@ * allow multi-segment mappings. Else all mappings are single-segment. *------------------------------------------------------------------------*/ void -usbd_dma_tag_create(bus_dma_tag_t tag_parent, struct usbd_dma_tag *udt, +usbd_dma_tag_create(struct usbd_dma_tag *udt, uint32_t size, uint32_t align) { uint32_t nseg; @@ -2890,7 +2932,7 @@ if (udt->p_seg == NULL) { return; } - udt->tag = tag_parent; + udt->tag = udt->tag_parent->tag; udt->n_seg = nseg; return; } @@ -2906,19 +2948,20 @@ } /*------------------------------------------------------------------------* - * usbd_pc_alloc_mem_cb - BUS-DMA callback function + * usbd_pc_common_mem_cb - BUS-DMA callback function *------------------------------------------------------------------------*/ static void -usbd_pc_alloc_mem_cb(struct usbd_page_cache *pc, bus_dma_segment_t *segs, - int nseg, int error) +usbd_pc_common_mem_cb(struct usbd_page_cache *pc, bus_dma_segment_t *segs, + int nseg, int error, uint8_t isload) { + struct usbd_dma_parent_tag *uptag; struct usbd_xfer *xfer; struct usbd_page *pg; uint32_t rem; uint8_t owned; uint8_t ext_seg; /* extend last segment */ - xfer = pc->xfer; + uptag = pc->tag_parent; /* * XXX There is sometimes recursive locking here. @@ -2928,16 +2971,7 @@ */ if (error) { - if (xfer) { - owned = mtx_owned(xfer->priv_mtx); - if (!owned) - mtx_lock(xfer->priv_mtx); - xfer->usb_root->dma_error = 1; - usbd_bdma_done_event(xfer->usb_root); - if (!owned) - mtx_unlock(xfer->priv_mtx); - } - return; + goto done; } pg = pc->page_start; pg->physaddr = segs->ds_addr & ~(USB_PAGE_SIZE - 1); @@ -2967,14 +3001,19 @@ if (ext_seg && pc->ismultiseg) { (pg + 1)->physaddr = pg->physaddr + USB_PAGE_SIZE; } - if (xfer) { - owned = mtx_owned(xfer->priv_mtx); - if (!owned) - mtx_lock(xfer->priv_mtx); - usbd_bdma_done_event(xfer->usb_root); - if (!owned) - mtx_unlock(xfer->priv_mtx); +done: + owned = mtx_owned(uptag->mtx); + if (!owned) + mtx_lock(uptag->mtx); + + uptag->dma_error = (error ? 1 : 0); + if (isload) { + (uptag->func) (uptag); + } else { + cv_broadcast(uptag->cv); } + if (!owned) + mtx_unlock(uptag->mtx); return; } @@ -2986,15 +3025,16 @@ * Else: Failure *------------------------------------------------------------------------*/ uint8_t -usbd_pc_alloc_mem(bus_dma_tag_t parent_tag, struct usbd_dma_tag *utag, - struct usbd_page_cache *pc, struct usbd_page *pg, uint32_t size, - uint32_t align, uint8_t utag_max) +usbd_pc_alloc_mem(struct usbd_page_cache *pc, struct usbd_page *pg, + uint32_t size, uint32_t align) { + struct usbd_dma_parent_tag *uptag; caddr_t ptr = NULL; - bus_dma_tag_t tag; bus_dmamap_t map; int seg_count; + uptag = pc->tag_parent; + if (align != 1) { /* * The alignment must be greater or equal to the @@ -3009,26 +3049,23 @@ } } /* get the correct DMA tag */ - utag = usbd_dma_tag_setup(parent_tag, utag, size, align, utag_max); + utag = usbd_dma_tag_find(pc->tag_parent, size, align); if (utag == NULL) { goto done_5; } - /* get the DMA tag */ - tag = utag->tag; - - if (bus_dmamem_alloc(tag, size, align, 0, utag->p_seg, + if (bus_dmamem_alloc(utag->tag, size, align, 0, utag->p_seg, utag->n_seg, &seg_count, BUS_DMA_WAITOK)) { goto done_4; } - if (bus_dmamem_map(tag, utag->p_seg, seg_count, size, + if (bus_dmamem_map(utag->tag, utag->p_seg, seg_count, size, &ptr, BUS_DMA_WAITOK | BUS_DMA_COHERENT)) { goto done_3; } - if (bus_dmamap_create(tag, size, utag->n_seg, (align == 1) ? + if (bus_dmamap_create(utag->tag, size, utag->n_seg, (align == 1) ? USB_PAGE_SIZE : size, 0, BUS_DMA_WAITOK, &map)) { goto done_2; } - if (bus_dmamap_load(tag, map, ptr, size, NULL, + if (bus_dmamap_load(utag->tag, map, ptr, size, NULL, BUS_DMA_WAITOK)) { goto done_1; } @@ -3050,10 +3087,10 @@ pc->page_offset_buf = 0; pc->page_offset_end = size; pc->map = map; - pc->tag = tag; + pc->tag = utag->tag; pc->ismultiseg = (align == 1); - usbd_pc_alloc_mem_cb(pc, utag->p_seg, seg_count, 0); + usbd_pc_common_mem_cb(pc, utag->p_seg, seg_count, 0, 0); bzero(ptr, size); @@ -3112,11 +3149,6 @@ { int error; - /* sanity check */ - if (pc->xfer == NULL) { - panic("This page cache is not loadable!\n"); - return; - } /* setup page cache */ pc->page_offset_buf = 0; pc->page_offset_end = size; @@ -3124,9 +3156,7 @@ if (size > 0) { - pc->xfer->usb_root->dma_refcount++; - - /* try to load memory into DMA */ + /* try to load memory into DMA using using no wait option */ if (bus_dmamap_load(pc->tag, pc->map, pc->buffer, size, NULL, BUS_DMA_NOWAIT)) { error = ENOMEM; @@ -3134,8 +3164,15 @@ error = 0; } - usbd_pc_alloc_mem_cb(pc, pc->map->dm_segs, - pc->map->dm_nsegs, error); + usbd_pc_common_mem_cb(pc, pc->map->dm_segs, + pc->map->dm_nsegs, error, 1); + } else { + /* + * Call callback so that refcount is decremented + * properly: + */ + pc->tag_parent->dma_error = 0; + (pc->tag_parent->func) (pc->tag_parent); } return; } @@ -3182,17 +3219,15 @@ { struct usbd_memory_info *info; struct usbd_dma_tag *utag; - bus_dma_tag_t tag; + + /* get info */ + info = pc->tag_parent->info; /* sanity check */ - if (pc->xfer == NULL) { + if (info == NULL) { goto error; } - info = pc->xfer->usb_root; - tag = pc->xfer->udev->bus->dma_tag_parent; - - utag = usbd_dma_tag_setup(tag, info->dma_tag_p, - size, 1, info->dma_tag_max); + utag = usbd_dma_tag_find(pc->tag_parent, size, 1); if (utag == NULL) { goto error; } @@ -3759,19 +3794,25 @@ } /*------------------------------------------------------------------------* - * usbd_bus_tag_setup - factored out code + * usbd_dma_tag_find - factored out code *------------------------------------------------------------------------*/ struct usbd_dma_tag * -usbd_dma_tag_setup(bus_dma_tag_t tag_parent, struct usbd_dma_tag *udt, - uint32_t size, uint32_t align, uint8_t nudt) +usbd_dma_tag_find(struct usbd_dma_parent_tag *udpt, + uint32_t size, uint32_t align) { + struct usbd_dma_tag *udt; + uint8_t nudt; + __KASSERT(align > 0, ("Invalid parameter align = 0!\n")); __KASSERT(size > 0, ("Invalid parameter size = 0!\n")); + udt = udpt->utag_first; + nudt = udpt->utag_max; + while (nudt--) { if (udt->align == 0) { - usbd_dma_tag_create(tag_parent, udt, size, align); + usbd_dma_tag_create(udt, size, align); if (udt->tag == NULL) { return (NULL); } @@ -3788,19 +3829,70 @@ } /*------------------------------------------------------------------------* + * usbd_dma_tag_setup - initialise USB DMA tags + *------------------------------------------------------------------------*/ +void +usbd_dma_tag_setup(struct usbd_dma_parent_tag *udpt, + struct usbd_dma_tag *udt, bus_dma_tag_t dmat, + struct mtx *mtx, usbd_dma_callback_t *func, + struct usbd_memory_info *info, uint8_t ndmabits, + uint8_t nudt) +{ + bzero(udpt, sizeof(*udpt)); + + /* sanity checking */ + if ((nudt == 0) || + (ndmabits == 0) || + (mtx == NULL)) { + /* something is corrupt */ + return; + } + /* initialise condition variable */ + cv_init(udpt->cv, "USB DMA CV"); + + /* store some information */ + udpt->mtx = mtx; + udpt->info = info; + udpt->func = func; + udpt->tag = dmat; + udpt->utag_first = udt; + udpt->utag_max = nudt; + udpt->dma_bits = ndmabits; + + while (nudt--) { + bzero(udt, sizeof(*udt)); + udt->tag_parent = udpt; + udt++; + } + return; +} + +/*------------------------------------------------------------------------* * usbd_bus_tag_unsetup - factored out code *------------------------------------------------------------------------*/ void -usbd_dma_tag_unsetup(struct usbd_dma_tag *udt, uint8_t nudt) +usbd_dma_tag_unsetup(struct usbd_dma_parent_tag *udpt) { + struct usbd_dma_tag *udt; + uint8_t nudt; + + udt = udpt->utag_first; + nudt = udpt->utag_max; + while (nudt--) { if (udt->align) { + /* destroy the USB DMA tag */ usbd_dma_tag_destroy(udt); udt->align = 0; } udt++; } + + if (udpt->utag_max) { + /* destroy the condition variable */ + cv_destroy(udpt->cv); + } return; } @@ -3834,9 +3926,10 @@ usbd_bus_mem_alloc_all_cb(struct usbd_bus *bus, struct usbd_page_cache *pc, struct usbd_page *pg, uint32_t size, uint32_t align) { - if (usbd_pc_alloc_mem(bus->dma_tag_parent, - bus->dma_tags, pc, pg, size, align, - USB_BUS_DMA_TAG_MAX)) { + /* need to initialize the page cache */ + pc->tag_parent = bus->dma_parent_tag; + + if (usbd_pc_alloc_mem(pc, pg, size, align)) { bus->alloc_failed = 1; } return; @@ -3850,7 +3943,8 @@ * Else: Failure *------------------------------------------------------------------------*/ uint8_t -usbd_bus_mem_alloc_all(struct usbd_bus *bus, usbd_bus_mem_cb_t *cb) +usbd_bus_mem_alloc_all(struct usbd_bus *bus, bus_dma_tag_t dmat, + usbd_bus_mem_cb_t *cb) { bus->alloc_failed = 0; @@ -3859,6 +3953,9 @@ LIST_INIT(&(bus->intr_list_head)); + usbd_dma_tag_setup(bus->dma_parent_tag, bus->dma_tags, + dmat, &(bus->mtx), NULL, NULL, 32, USB_BUS_DMA_TAG_MAX); + if (cb) { cb(bus, &usbd_bus_mem_alloc_all_cb); } @@ -3888,7 +3985,7 @@ if (cb) { cb(bus, &usbd_bus_mem_free_all_cb); } - usbd_dma_tag_unsetup(bus->dma_tags, USB_BUS_DMA_TAG_MAX); + usbd_dma_tag_unsetup(bus->dma_parent_tag); mtx_destroy(&(bus->mtx)); @@ -3921,10 +4018,12 @@ parm->dma_page_cache_ptr++; return (0); } - if (usbd_pc_alloc_mem(parm->udev->bus->dma_tag_parent, - parm->dma_tag_p, parm->dma_page_cache_ptr, - parm->dma_page_ptr, size, align, - parm->dma_tag_max)) { + /* need to initialize the page cache */ + parm->dma_page_cache_ptr->tag_parent = + &(parm->curr_xfer->usb_root->dma_parent_tag); + + if (usbd_pc_alloc_mem(parm->dma_page_cache_ptr, + parm->dma_page_ptr, size, align)) { return (1); /* failure */ } if (info) { From owner-p4-projects@FreeBSD.ORG Tue Apr 1 21:11:56 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7DC57106566C; Tue, 1 Apr 2008 21:11:56 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DF7F61065672 for ; Tue, 1 Apr 2008 21:11:55 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CF38A8FC1C for ; Tue, 1 Apr 2008 21:11:55 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m31LBt1t012012 for ; Tue, 1 Apr 2008 21:11:55 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m31LBtZj012010 for perforce@freebsd.org; Tue, 1 Apr 2008 21:11:55 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 1 Apr 2008 21:11:55 GMT Message-Id: <200804012111.m31LBtZj012010@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 139166 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Apr 2008 21:11:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=139166 Change 139166 by hselasky@hselasky_laptop001 on 2008/04/01 21:11:23 To solve the following three problems I have to make a set of BUS-DMA related changes. Commit 3/3 P1) I should pass a valid lock function to "bus_dma_tag_create". P2) Currently the error code EINPROGRESS is not handled at all, when returned by "bus_dmamap_load". I have created a new condition variable that will be used to wait for the done callback. P3) Ensure that all USB page caches on an USB transfer are loaded in serial, mostly in case of page bouncing. Changes in "usb_transfer.c" from the top: 1) Use new function "usbd_dma_tag_setup" to initialise the USB DMA structures. 2) New arguments for "usbd_dma_tag_unsetup()". 3) Factored out code into "usbd_bdma_get_next_xfer()". 4) Modifications to "usbd_bdma_work_loop" so that P3 is solved. The idea is that the calls to "usbd_pc_load_mem()" are moved outside the main loop and the state of the current frame buffer to load is stored in the "usbd_memory_info" structure. When "info->dma_currframe == info->dma_nframes" all frames have been loaded. 5) Some modifications to "usbd_bdma_done_event()" because the BUS-DMA abstraction is now less USB-specific. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#123 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#123 (text+ko) ==== @@ -63,6 +63,7 @@ static void usbd_premature_callback(struct usbd_xfer *xfer, usbd_status_t error); static void usbd_pipe_enter_wrapper(struct usbd_xfer *xfer); static void usbd_bdma_work_loop(struct usbd_memory_info *info); +static void usbd_bdma_done_event(struct usbd_dma_parent_tag *udpt); static void usbd_callback_intr_sched(struct usbd_memory_info *info); static void usbd_callback_intr_td_sub(struct usbd_xfer **xfer, uint8_t dropcount); static void usbd_callback_intr_td(void *arg); @@ -814,7 +815,8 @@ if (parm->buf) { for (x = 0; x != n_frbuffers; x++) { - xfer->frbuffers[x].xfer = xfer; + xfer->frbuffers[x].tag_parent = + &(xfer->usb_root->dma_parent_tag); if (xfer->flags_int.bdma_enable && (parm->bufsize_max > 0)) { @@ -943,8 +945,11 @@ info->usb_mtx = &(udev->bus->mtx); info->priv_mtx = priv_mtx; - info->dma_tag_p = parm.dma_tag_p; - info->dma_tag_max = parm.dma_tag_max; + + usbd_dma_tag_setup(&(info->dma_parent_tag), + parm.dma_tag_p, udev->bus->dma_parent_tag[0].tag, + priv_mtx, &usbd_bdma_done_event, info, 32, parm.dma_tag_max); + info->bus = udev->bus; LIST_INIT(&(info->done_head)); @@ -1231,8 +1236,7 @@ } /* free all DMA tags */ - usbd_dma_tag_unsetup(info->dma_tag_p, - info->dma_tag_max); + usbd_dma_tag_unsetup(&(info->dma_parent_tag)); /* * free the "memory_base" last, hence the "info" structure is @@ -1801,7 +1805,7 @@ info = xfer->usb_root; /* - * Only call the BUS-DMA work loop when it is not busy + * Only call the BUS-DMA work loop when it is not busy: */ if (info->dma_refcount == 0) { usbd_bdma_work_loop(info); @@ -1841,9 +1845,31 @@ } /*------------------------------------------------------------------------* + * usbd_bdma_get_next_xfer + * + * This function will advance the "dma_curr_xfer" pointer to the next + * USB transfer in the queue. + *------------------------------------------------------------------------*/ +static void +usbd_bdma_get_next_xfer(struct usbd_memory_info *info) +{ + struct usbd_xfer *xfer; + + xfer = info->dma_curr_xfer; + + /* prepare next USB transfer to load, if any */ + info->dma_curr_xfer = + LIST_PREV(&(info->dma_head), xfer, dma_list); + LIST_REMOVE(xfer, dma_list); + xfer->dma_list.le_prev = NULL; + return; +} + +/*------------------------------------------------------------------------* * usbd_bdma_work_loop * - * This function handles loading of virtual buffers into DMA. + * This function handles loading of virtual buffers into DMA and is + * only called when "dma_refcount" is zero. *------------------------------------------------------------------------*/ static void usbd_bdma_work_loop(struct usbd_memory_info *info) @@ -1860,44 +1886,69 @@ xfer = info->dma_curr_xfer; if (xfer) { - /* prepare next USB transfer to load, if any */ - info->dma_curr_xfer = - LIST_PREV(&(info->dma_head), xfer, dma_list); - LIST_REMOVE(xfer, dma_list); - xfer->dma_list.le_prev = NULL; + + /* prevent recursion by increasing the DMA refcount */ + + info->dma_refcount = 2; - /* check for DMA error */ + /* check for errors */ if (!xfer->flags_int.open) { + /* get next xfer */ + usbd_bdma_get_next_xfer(info); + /* we got cancelled */ - - info->dma_refcount++; usbd_premature_callback(xfer, USBD_ERR_CANCELLED); - info->dma_refcount--; } else if (info->dma_error) { - /* prevent recursion by increasing refcount */ - - info->dma_refcount++; + /* get next xfer */ + usbd_bdma_get_next_xfer(info); /* report error */ - usbd_premature_callback(xfer, USBD_ERR_DMA_LOAD_FAILED); - info->dma_refcount--; + } else if (info->dma_currframe != info->dma_nframes) { + + if (info->dma_currframe == 0) { + /* special case */ + usbd_pc_load_mem(xfer->frbuffers, + info->dma_frlength_0); + } else { + /* default case */ + nframes = info->dma_currframe; + usbd_pc_load_mem(xfer->frbuffers + nframes, + xfer->frlengths[nframes]); + } + + /* advance frame index */ + info->dma_currframe++; + /* check if callback has decremented refcount */ + if (--(info->dma_refcount) == 0) { + /* we are complete */ + goto load_complete; + } else { + /* wait for callback */ + return; + } } else { + + /* get next xfer */ + usbd_bdma_get_next_xfer(info); + /* go ahead */ usbd_bdma_pre_sync(xfer); /* finally start the hardware */ usbd_pipe_enter_wrapper(xfer); + } + + info->dma_refcount = 0; - } } else { /* get first USB transfer */ info->dma_curr_xfer = @@ -1915,7 +1966,6 @@ } /* reset BUS-DMA load state */ - info->dma_refcount = 1; info->dma_error = 0; if (xfer->flags_int.isochronous_xfr) { @@ -1949,44 +1999,53 @@ xfer->frbuffers[0].isread = isread; } + /* + * Setup the "page_start" pointer which points to an array of + * USB pages where information about the physical address of a + * page will be stored. Also initialise the "isread" field of + * the USB page caches. + */ xfer->frbuffers[0].page_start = pg; - usbd_pc_load_mem(xfer->frbuffers, frlength_0); + info->dma_nframes = nframes; + info->dma_currframe = 0; + info->dma_frlength_0 = frlength_0; pg += (frlength_0 / USB_PAGE_SIZE); pg += 2; while (--nframes > 0) { xfer->frbuffers[nframes].isread = isread; - xfer->frbuffers[nframes].page_start = pg; - usbd_pc_load_mem(xfer->frbuffers + nframes, - xfer->frlengths[nframes]); - pg += (xfer->frlengths[nframes] / USB_PAGE_SIZE); pg += 2; } - if (--(info->dma_refcount) == 0) { - /* we are complete */ - goto load_complete; - } - return; + goto load_complete; } /*------------------------------------------------------------------------* * usbd_bdma_done_event * * This function is called when the BUS-DMA has loaded virtual memory - * into DMA, if any + * into DMA, if any. *------------------------------------------------------------------------*/ -void -usbd_bdma_done_event(struct usbd_memory_info *info) +static void +usbd_bdma_done_event(struct usbd_dma_parent_tag *udpt) { + struct usbd_memory_info *info; + + info = udpt->info; + mtx_assert(info->priv_mtx, MA_OWNED); + /* copy error */ + info->dma_error = udpt->dma_error; + + /* check refcount */ if (--(info->dma_refcount) == 0) { + /* call work loop */ usbd_bdma_work_loop(info); } return; From owner-p4-projects@FreeBSD.ORG Tue Apr 1 21:19:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 35729106566C; Tue, 1 Apr 2008 21:19:04 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E9B3E106564A for ; Tue, 1 Apr 2008 21:19:03 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DA2568FC22 for ; Tue, 1 Apr 2008 21:19:03 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m31LJ3pp012152 for ; Tue, 1 Apr 2008 21:19:03 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m31LJ3Zu012150 for perforce@freebsd.org; Tue, 1 Apr 2008 21:19:03 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 1 Apr 2008 21:19:03 GMT Message-Id: <200804012119.m31LJ3Zu012150@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 139167 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Apr 2008 21:19:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=139167 Change 139167 by hselasky@hselasky_laptop001 on 2008/04/01 21:18:34 Activate new feature. The USB BUS-DMA abstraction now allows you to specify how many address lines the hardware has. Currently the default is 32. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#103 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.c#103 (text+ko) ==== @@ -2547,7 +2547,7 @@ ( /* parent */ udt->tag_parent->tag, /* alignment */ align, /* boundary */ 0, - /* lowaddr */ BUS_SPACE_MAXADDR_32BIT, + /* lowaddr */ (2ULL << (udt->tag_parent->dma_bits - 1)) - 1, /* highaddr */ BUS_SPACE_MAXADDR, /* filter */ NULL, /* filterarg */ NULL, From owner-p4-projects@FreeBSD.ORG Tue Apr 1 22:05:55 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D03551065671; Tue, 1 Apr 2008 22:05:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8E55A106566C for ; Tue, 1 Apr 2008 22:05:54 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7DE5B8FC14 for ; Tue, 1 Apr 2008 22:05:54 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m31M5sJ6015480 for ; Tue, 1 Apr 2008 22:05:54 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m31M5s2S015478 for perforce@freebsd.org; Tue, 1 Apr 2008 22:05:54 GMT (envelope-from sam@freebsd.org) Date: Tue, 1 Apr 2008 22:05:54 GMT Message-Id: <200804012205.m31M5s2S015478@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 139170 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Apr 2008 22:05:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=139170 Change 139170 by sam@sam_ebb on 2008/04/01 22:05:16 split crypto capabilities into their own area and explicitly connect the bits to the cipher values; we were out of capability bits and the cipher caps need to grow too Affected files ... .. //depot/projects/vap/sbin/ifconfig/ifieee80211.c#17 edit .. //depot/projects/vap/sys/conf/files#27 edit .. //depot/projects/vap/sys/dev/ath/if_ath.c#55 edit .. //depot/projects/vap/sys/dev/if_ndis/if_ndis.c#9 edit .. //depot/projects/vap/sys/dev/mwl/if_mwl.c#2 edit .. //depot/projects/vap/sys/dev/wi/if_wi.c#21 edit .. //depot/projects/vap/sys/net80211/ieee80211.c#32 edit .. //depot/projects/vap/sys/net80211/ieee80211_crypto.c#11 edit .. //depot/projects/vap/sys/net80211/ieee80211_crypto.h#11 edit .. //depot/projects/vap/sys/net80211/ieee80211_ddb.c#9 edit .. //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#49 edit .. //depot/projects/vap/sys/net80211/ieee80211_ioctl.h#17 edit .. //depot/projects/vap/sys/net80211/ieee80211_var.h#35 edit Differences ... ==== //depot/projects/vap/sbin/ifconfig/ifieee80211.c#17 (text+ko) ==== @@ -3061,23 +3061,33 @@ } #define IEEE80211_C_BITS \ -"\020\1WEP\2TKIP\3AES\4AES_CCM\6CKIP\7FF\10TURBOP\11IBSS\12PMGT\13HOSTAP\14AHDEMO" \ -"\15SWRETRY\16TXPMGT\17SHSLOT\20SHPREAMBLE\21MONITOR\22TKIPMIC\30WPA1" \ -"\31WPA2\32BURST\33WME\34WDS\36BGSCAN\37TXFRAG" + "\20\7FF\10TURBOP\11IBSS\12PMGT" \ + "\13HOSTAP\14AHDEMO\15SWRETRY\16TXPMGT\17SHSLOT\20SHPREAMBLE" \ + "\21MONITOR\30WPA1\31WPA2\32BURST\33WME\34WDS\36BGSCAN" \ + "\37TXFRAG" + +#define IEEE80211_CRYPTO_BITS \ + "\20\1WEP\2TKIP\3AES\4AES_CCM\5TKIPMIC\6CKIP\12PMGT" + +#define IEEE80211_HTCAP_BITS \ + "\20\1LDPC\2CHWIDTH40\5GREENFIELD\6SHORTGI20\7SHORTGI40\10TXSTBC" \ + "\21AMPDU\22AMSDU\23HT" static void list_capabilities(int s) { - struct ieee80211req ireq; - u_int32_t caps; + struct ieee80211_devcaps_req dc; - (void) memset(&ireq, 0, sizeof(ireq)); - (void) strncpy(ireq.i_name, name, sizeof(ireq.i_name)); - ireq.i_type = IEEE80211_IOC_DRIVER_CAPS; - if (ioctl(s, SIOCG80211, &ireq) < 0) - errx(1, "unable to get driver capabilities"); - caps = (((u_int16_t) ireq.i_val) << 16) | ((u_int16_t) ireq.i_len); - printb(name, caps, IEEE80211_C_BITS); + getdevcaps(s, &dc); + printb("drivercaps", dc.dc_drivercaps, IEEE80211_C_BITS); + if (dc.dc_cryptocaps != 0 || verbose) { + putchar('\n'); + printb("cryptocaps", dc.dc_cryptocaps, IEEE80211_CRYPTO_BITS); + } + if (dc.dc_htcaps != 0 || verbose) { + putchar('\n'); + printb("htcaps", dc.dc_htcaps, IEEE80211_HTCAP_BITS); + } putchar('\n'); } ==== //depot/projects/vap/sys/conf/files#27 (text+ko) ==== @@ -1161,6 +1161,7 @@ dev/usb/ufm.c optional ufm dev/usb/uftdi.c optional uftdi dev/usb/ugen.c optional ugen +dev/usb/ugencom.c optional ugencom dev/usb/uhci.c optional uhci dev/usb/uhci_pci.c optional uhci pci dev/usb/uhid.c optional uhid ==== //depot/projects/vap/sys/dev/ath/if_ath.c#55 (text+ko) ==== @@ -524,22 +524,22 @@ * Query the hal to figure out h/w crypto support. */ if (ath_hal_ciphersupported(ah, HAL_CIPHER_WEP)) - ic->ic_caps |= IEEE80211_C_WEP; + setbit(ic->ic_cryptocaps, IEEE80211_CIPHER_WEP); if (ath_hal_ciphersupported(ah, HAL_CIPHER_AES_OCB)) - ic->ic_caps |= IEEE80211_C_AES; + setbit(ic->ic_cryptocaps, IEEE80211_CIPHER_AES_OCB); if (ath_hal_ciphersupported(ah, HAL_CIPHER_AES_CCM)) - ic->ic_caps |= IEEE80211_C_AES_CCM; + setbit(ic->ic_cryptocaps, IEEE80211_CIPHER_AES_CCM); if (ath_hal_ciphersupported(ah, HAL_CIPHER_CKIP)) - ic->ic_caps |= IEEE80211_C_CKIP; + setbit(ic->ic_cryptocaps, IEEE80211_CIPHER_CKIP); if (ath_hal_ciphersupported(ah, HAL_CIPHER_TKIP)) { - ic->ic_caps |= IEEE80211_C_TKIP; + setbit(ic->ic_cryptocaps, IEEE80211_CIPHER_TKIP); /* * Check if h/w does the MIC and/or whether the * separate key cache entries are required to * handle both tx+rx MIC keys. */ if (ath_hal_ciphersupported(ah, HAL_CIPHER_MIC)) - ic->ic_caps |= IEEE80211_C_TKIPMIC; + setbit(ic->ic_cryptocaps, IEEE80211_CIPHER_TKIPMIC); /* * If the h/w supports storing tx+rx MIC keys * in one cache slot automatically enable use. ==== //depot/projects/vap/sys/dev/if_ndis/if_ndis.c#9 (text+ko) ==== @@ -872,20 +872,22 @@ arg = NDIS_80211_WEPSTAT_ENC3ENABLED; r = ndis_set_info(sc, OID_802_11_ENCRYPTION_STATUS, &arg, &i); if (r == 0) { - ic->ic_caps |= IEEE80211_C_WEP|IEEE80211_C_TKIP| - IEEE80211_C_AES_CCM; + setbit(ic->ic_cryptocaps, IEEE80211_CIPHER_WEP); + setbit(ic->ic_cryptocaps, IEEE80211_CIPHER_TKIP); + setbit(ic->ic_cryptocaps, IEEE80211_CIPHER_AES_CCM); goto got_crypto; } arg = NDIS_80211_WEPSTAT_ENC2ENABLED; r = ndis_set_info(sc, OID_802_11_ENCRYPTION_STATUS, &arg, &i); if (r == 0) { - ic->ic_caps |= IEEE80211_C_WEP|IEEE80211_C_TKIP; + setbit(ic->ic_cryptocaps, IEEE80211_CIPHER_WEP); + setbit(ic->ic_cryptocaps, IEEE80211_CIPHER_TKIP); goto got_crypto; } arg = NDIS_80211_WEPSTAT_ENC1ENABLED; r = ndis_set_info(sc, OID_802_11_ENCRYPTION_STATUS, &arg, &i); if (r == 0) - ic->ic_caps |= IEEE80211_C_WEP; + setbit(ic->ic_cryptocaps, IEEE80211_CIPHER_WEP); got_crypto: i = sizeof(arg); r = ndis_get_info(sc, OID_802_11_POWER_MODE, &arg, &i); @@ -2061,19 +2063,19 @@ len = sizeof(arg); if (cipher == WPA_CSE_WEP40 || WPA_CSE_WEP104) { - if (!(ic->ic_caps & IEEE80211_C_WEP)) + if (!isset(ic->ic_cryptocaps, IEEE80211_CIPHER_WEP)) return(ENOTSUP); arg = NDIS_80211_WEPSTAT_ENC1ENABLED; } if (cipher == WPA_CSE_TKIP) { - if (!(ic->ic_caps & IEEE80211_C_TKIP)) + if (!isset(ic->ic_cryptocaps, IEEE80211_CIPHER_TKIP)) return(ENOTSUP); arg = NDIS_80211_WEPSTAT_ENC2ENABLED; } if (cipher == WPA_CSE_CCMP) { - if (!(ic->ic_caps & IEEE80211_C_AES_CCM)) + if (!isset(ic->ic_cryptocaps, IEEE80211_CIPHER_AES_CCM)) return(ENOTSUP); arg = NDIS_80211_WEPSTAT_ENC3ENABLED; } ==== //depot/projects/vap/sys/dev/mwl/if_mwl.c#2 (text+ko) ==== @@ -440,15 +440,9 @@ | IEEE80211_C_WPA /* capable of WPA1+WPA2 */ | IEEE80211_C_BGSCAN /* capable of bg scanning */ | IEEE80211_C_TXFRAG /* handle tx frags */ - /* - * XXX no way to query h/w support. - */ - | IEEE80211_C_WEP /* h/w WEP supported */ - | IEEE80211_C_AES_CCM /* h/w AES supported */ - | IEEE80211_C_TKIP /* h/w TKIP supported */ - | IEEE80211_C_TKIPMIC /* h/w TKIP MIC supported */ | IEEE80211_C_TXPMGT /* capable of txpow mgt */ ; + ic->ic_htcaps = IEEE80211_HTCAP_SMPS_ENA /* SM PS mode enabled */ | IEEE80211_HTCAP_CHWIDTH40 /* 40MHz channel width */ @@ -471,6 +465,15 @@ ; /* + * Mark h/w crypto support. + * XXX no way to query h/w support. + */ + setbit(ic->ic_cryptocaps, IEEE80211_CIPHER_WEP); + setbit(ic->ic_cryptocaps, IEEE80211_CIPHER_AES_CCM); + setbit(ic->ic_cryptocaps, IEEE80211_CIPHER_TKIP); + setbit(ic->ic_cryptocaps, IEEE80211_CIPHER_TKIPMIC); + + /* * Transmit requires space in the packet for a special * format transmit record and optional padding between * this record and the payload. Ask the net80211 layer ==== //depot/projects/vap/sys/dev/wi/if_wi.c#21 (text+ko) ==== @@ -407,7 +407,7 @@ buflen = sizeof(val); if (wi_read_rid(sc, WI_RID_WEP_AVAIL, &val, &buflen) == 0 && val != htole16(0)) - ic->ic_caps |= IEEE80211_C_WEP; + setbit(ic->ic_cryptocaps, IEEE80211_CIPHER_WEP); /* Find supported rates. */ buflen = sizeof(ratebuf); @@ -826,7 +826,7 @@ ieee80211_chan2ieee(ic, bss->ni_chan)); /* Configure WEP. */ - if (ic->ic_caps & IEEE80211_C_WEP) + if (isset(ic->ic_cryptocaps, IEEE80211_CIPHER_WEP)) wi_write_wep(sc, vap); else sc->sc_encryption = 0; @@ -916,7 +916,7 @@ wi_write_val(sc, WI_RID_PROMISC, 0); /* Configure WEP. */ - if (ic->ic_caps & IEEE80211_C_WEP) + if (isset(ic->ic_cryptocaps, IEEE80211_CIPHER_WEP)) wi_write_wep(sc, vap); else sc->sc_encryption = 0; ==== //depot/projects/vap/sys/net80211/ieee80211.c#32 (text+ko) ==== @@ -324,6 +324,13 @@ vap->iv_flags_ext = ic->ic_flags_ext; vap->iv_flags_ven = ic->ic_flags_ven; vap->iv_caps = ic->ic_caps &~ IEEE80211_C_OPMODE; + vap->iv_cryptocaps[0] = ic->ic_cryptocaps[0]; +#if IEEE80211_CIPHER_MAX > 8 + vap->iv_cryptocaps[1] = ic->ic_cryptocaps[1]; +#endif +#if IEEE80211_CIPHER_MAX > 16 +#error "too many crypto capability bits" +#endif vap->iv_htcaps = ic->ic_htcaps; vap->iv_opmode = opmode; switch (opmode) { ==== //depot/projects/vap/sys/net80211/ieee80211_crypto.c#11 (text+ko) ==== @@ -240,6 +240,7 @@ "wlan_tkip", /* IEEE80211_CIPHER_TKIP */ "wlan_aes_ocb", /* IEEE80211_CIPHER_AES_OCB */ "wlan_ccmp", /* IEEE80211_CIPHER_AES_CCM */ + "#4", /* reserved */ "wlan_ckip", /* IEEE80211_CIPHER_CKIP */ "wlan_none", /* IEEE80211_CIPHER_NONE */ }; @@ -308,7 +309,7 @@ * If the hardware does not support the cipher then * fallback to a host-based implementation. */ - if ((vap->iv_caps & (1<iv_cryptocaps, cipher)) { IEEE80211_DPRINTF(vap, IEEE80211_MSG_CRYPTO, "%s: no h/w support for cipher %s, falling back to s/w\n", __func__, cip->ic_name); @@ -320,7 +321,7 @@ * the cipher modules honor it. */ if (cipher == IEEE80211_CIPHER_TKIP && - (vap->iv_caps & IEEE80211_C_TKIPMIC) == 0) { + !isset(vap->iv_cryptocaps, IEEE80211_CIPHER_TKIPMIC)) { IEEE80211_DPRINTF(vap, IEEE80211_MSG_CRYPTO, "%s: no h/w support for TKIP MIC, falling back to s/w\n", __func__); ==== //depot/projects/vap/sys/net80211/ieee80211_crypto.h#11 (text+ko) ==== @@ -96,13 +96,16 @@ /* * NB: these values are ordered carefully; there are lots of - * of implications in any reordering. In particular beware - * that 4 is not used to avoid conflicting with IEEE80211_F_PRIVACY. + * of implications in any reordering. Beware that 4 is used + * only to indicate h/w TKIP MIC support in driver capabilities; + * there is no separate cipher support (it's rolled into the + * TKIP cipher support). */ #define IEEE80211_CIPHER_WEP 0 #define IEEE80211_CIPHER_TKIP 1 #define IEEE80211_CIPHER_AES_OCB 2 #define IEEE80211_CIPHER_AES_CCM 3 +#define IEEE80211_CIPHER_TKIPMIC 4 /* TKIP MIC capability */ #define IEEE80211_CIPHER_CKIP 5 #define IEEE80211_CIPHER_NONE 6 /* pseudo value */ ==== //depot/projects/vap/sys/net80211/ieee80211_ddb.c#9 (text+ko) ==== @@ -71,11 +71,14 @@ #define IEEE80211_FVEN_BITS "\20" #define IEEE80211_C_BITS \ - "\20\1WEP\2TKIP\3AES\4AES_CCM\6CKIP\7FF\10TURBOP\11IBSS\12PMGT" \ + "\20\7FF\10TURBOP\11IBSS\12PMGT" \ "\13HOSTAP\14AHDEMO\15SWRETRY\16TXPMGT\17SHSLOT\20SHPREAMBLE" \ - "\21MONITOR\22TKIPMIC\30WPA1\31WPA2\32BURST\33WME\34WDS\36BGSCAN" \ + "\21MONITOR\30WPA1\31WPA2\32BURST\33WME\34WDS\36BGSCAN" \ "\37TXFRAG" +#define IEEE80211_C_CRYPTO_BITS \ + "\20\1WEP\2TKIP\3AES\4AES_CCM\5TKIPMIC\6CKIP\12PMGT" + #define IEEE80211_C_HTCAP_BITS \ "\20\1LDPC\2CHWIDTH40\5GREENFIELD\6SHORTGI20\7SHORTGI40\10TXSTBC" \ "\21AMPDU\22AMSDU\23HT" @@ -327,6 +330,8 @@ db_printf("\tflags_ext=%b\n", vap->iv_flags_ext, IEEE80211_FEXT_BITS); db_printf("\tflags_ven=%b\n", vap->iv_flags_ven, IEEE80211_FVEN_BITS); db_printf("\tcaps=%b\n", vap->iv_caps, IEEE80211_C_BITS); + db_printf("\tcryptocaps=%b\n", + vap->iv_cryptocaps[0], IEEE80211_C_CRYPTO_BITS); db_printf("\thtcaps=%b\n", vap->iv_htcaps, IEEE80211_C_HTCAP_BITS); _db_show_stats(&vap->iv_stats); @@ -484,6 +489,8 @@ db_printf("\tflags_ext=%b\n", ic->ic_flags_ext, IEEE80211_FEXT_BITS); db_printf("\tflags_ven=%b\n", ic->ic_flags_ven, IEEE80211_FVEN_BITS); db_printf("\tcaps=%b\n", ic->ic_caps, IEEE80211_C_BITS); + db_printf("\tcryptocaps=%b\n", + ic->ic_cryptocaps[0], IEEE80211_C_CRYPTO_BITS); db_printf("\thtcaps=%b\n", ic->ic_htcaps, IEEE80211_HTCAP_BITS); #if 0 ==== //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#49 (text+ko) ==== @@ -700,9 +700,14 @@ sizeof(struct ieee80211_devcaps_req), M_TEMP, M_NOWAIT | M_ZERO); if (dc == NULL) return ENOMEM; - /* XXX temp until crypto caps split out of ic_caps */ - dc->dc_drivercaps = ic->ic_caps &~ IEEE80211_C_CRYPTO; - dc->dc_cryptocaps = ic->ic_caps & IEEE80211_C_CRYPTO; + dc->dc_drivercaps = ic->ic_caps; +#if IEEE80211_CIPHER_MAX <= 8 + dc->dc_cryptocaps = ic->ic_cryptocaps[0]; +#elif IEEE80211_CIPHER_MAX <= 16 + dc->dc_cryptocaps = (ic->ic_cryptocaps[0]<<8) | ic->ic_cryptocaps[1]; +#else +#error "too many crypto capability bits" +#endif dc->dc_htcaps = ic->ic_htcaps; ci = &dc->dc_chaninfo; ic->ic_getradiocaps(ic, &ci->ic_nchans, ci->ic_chans); @@ -877,10 +882,6 @@ case IEEE80211_IOC_COUNTERMEASURES: ireq->i_val = (vap->iv_flags & IEEE80211_F_COUNTERM) != 0; break; - case IEEE80211_IOC_DRIVER_CAPS: - ireq->i_val = vap->iv_caps>>16; - ireq->i_len = vap->iv_caps&0xffff; - break; case IEEE80211_IOC_WME: ireq->i_val = (vap->iv_flags & IEEE80211_F_WME) != 0; break; @@ -2680,11 +2681,6 @@ else vap->iv_flags &= ~IEEE80211_F_NOBRIDGE; break; - case IEEE80211_IOC_DRIVER_CAPS: - /* NB: for testing */ - vap->iv_caps = (((uint16_t) ireq->i_val) << 16) | - ((uint16_t) ireq->i_len); - break; case IEEE80211_IOC_BSSID: if (ireq->i_len != sizeof(tmpbssid)) return EINVAL; ==== //depot/projects/vap/sys/net80211/ieee80211_ioctl.h#17 (text+ko) ==== @@ -544,7 +544,7 @@ #define IEEE80211_IOC_HIDESSID 29 /* hide SSID mode (on, off) */ #define IEEE80211_IOC_APBRIDGE 30 /* AP inter-sta bridging */ /* 31-35,37-38 were for WPA authenticator settings */ -#define IEEE80211_IOC_DRIVER_CAPS 36 /* driver capabilities */ +/* 36 was IEEE80211_IOC_DRIVER_CAPS */ #define IEEE80211_IOC_WPAIE 39 /* WPA information element */ #define IEEE80211_IOC_STA_STATS 40 /* per-station statistics */ #define IEEE80211_IOC_MACCMD 41 /* MAC ACL operation */ ==== //depot/projects/vap/sys/net80211/ieee80211_var.h#35 (text+ko) ==== @@ -122,6 +122,7 @@ uint32_t ic_flags_ven; /* vendor state flags */ uint32_t ic_caps; /* capabilities */ uint32_t ic_htcaps; /* HT capabilities */ + uint8_t ic_cryptocaps[1];/* crypto capabilities */ uint8_t ic_modecaps[2]; /* set of mode capabilities */ uint8_t ic_promisc; /* vap's needing promisc mode */ uint8_t ic_allmulti; /* vap's needing all multicast*/ @@ -292,6 +293,7 @@ uint32_t iv_flags_ven; /* vendor state flags */ uint32_t iv_caps; /* capabilities */ uint32_t iv_htcaps; /* HT capabilities */ + uint8_t iv_cryptocaps[1];/* crypto capabilities */ enum ieee80211_opmode iv_opmode; /* operation mode */ enum ieee80211_state iv_state; /* state machine state */ void (*iv_newstate_cb)(struct ieee80211vap *, @@ -490,11 +492,7 @@ #define IEEE80211_FEXT_HTCOMPAT 0x10000000 /* CONF: HT vendor OUI's */ /* ic_caps/iv_caps: device driver capabilities */ -#define IEEE80211_C_WEP 0x00000001 /* CAPABILITY: WEP available */ -#define IEEE80211_C_TKIP 0x00000002 /* CAPABILITY: TKIP available */ -#define IEEE80211_C_AES 0x00000004 /* CAPABILITY: AES OCB avail */ -#define IEEE80211_C_AES_CCM 0x00000008 /* CAPABILITY: AES CCM avail */ -#define IEEE80211_C_CKIP 0x00000020 /* CAPABILITY: CKIP available */ +/* 0x2f available */ #define IEEE80211_C_FF 0x00000040 /* CAPABILITY: ATH FF avail */ #define IEEE80211_C_TURBOP 0x00000080 /* CAPABILITY: ATH Turbo avail*/ #define IEEE80211_C_IBSS 0x00000100 /* CAPABILITY: IBSS available */ @@ -506,7 +504,7 @@ #define IEEE80211_C_SHSLOT 0x00004000 /* CAPABILITY: short slottime */ #define IEEE80211_C_SHPREAMBLE 0x00008000 /* CAPABILITY: short preamble */ #define IEEE80211_C_MONITOR 0x00010000 /* CAPABILITY: monitor mode */ -#define IEEE80211_C_TKIPMIC 0x00020000 /* CAPABILITY: TKIP MIC avail */ +/* 0x20000 available */ #define IEEE80211_C_WPA1 0x00800000 /* CAPABILITY: WPA1 avail */ #define IEEE80211_C_WPA2 0x01000000 /* CAPABILITY: WPA2 avail */ #define IEEE80211_C_WPA 0x01800000 /* CAPABILITY: WPA1+WPA2 avail*/ @@ -518,8 +516,6 @@ #define IEEE80211_C_TXFRAG 0x40000000 /* CAPABILITY: tx fragments */ /* XXX protection/barker? */ -#define IEEE80211_C_CRYPTO 0x0000002f /* CAPABILITY: crypto alg's */ - /* * ic_htcaps/iv_htcaps: HT-specific device/driver capabilities * From owner-p4-projects@FreeBSD.ORG Tue Apr 1 23:30:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B79211065670; Tue, 1 Apr 2008 23:30:25 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 76AA4106564A for ; Tue, 1 Apr 2008 23:30:25 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 674628FC15 for ; Tue, 1 Apr 2008 23:30:25 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m31NUPVZ020202 for ; Tue, 1 Apr 2008 23:30:25 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m31NUPxR020200 for perforce@freebsd.org; Tue, 1 Apr 2008 23:30:25 GMT (envelope-from sam@freebsd.org) Date: Tue, 1 Apr 2008 23:30:25 GMT Message-Id: <200804012330.m31NUPxR020200@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 139171 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Apr 2008 23:30:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=139171 Change 139171 by sam@sam_ebb on 2008/04/01 23:30:11 checkpoint work I've been holding on to; includes tracking of various api changes Affected files ... .. //depot/projects/vap/sys/dev/iwn/if_iwn.c#6 edit .. //depot/projects/vap/sys/dev/iwn/if_iwnreg.h#4 edit .. //depot/projects/vap/sys/dev/iwn/if_iwnvar.h#3 edit Differences ... ==== //depot/projects/vap/sys/dev/iwn/if_iwn.c#6 (text+kox) ==== @@ -124,9 +124,6 @@ void iwn_unload_firmware(struct iwn_softc *); static void iwn_timer_timeout(void *); static void iwn_calib_reset(struct iwn_softc *); -static void iwn_amrr_reset(struct ieee80211vap *); -static void iwn_amrr_iter_func(void *, struct ieee80211_node *); -static void iwn_amrr_timeout(void *); void iwn_ampdu_rx_start(struct iwn_softc *, struct iwn_rx_desc *); void iwn_rx_intr(struct iwn_softc *, struct iwn_rx_desc *, struct iwn_rx_data *); @@ -147,7 +144,8 @@ static void iwn_watchdog(struct iwn_softc *); int iwn_ioctl(struct ifnet *, u_long, caddr_t); int iwn_cmd(struct iwn_softc *, int, const void *, int, int); -int iwn_setup_node_mrr(struct iwn_softc *, uint8_t, int); +int iwn_set_link_quality(struct iwn_softc *, uint8_t, + const struct ieee80211_channel *, int); int iwn_set_key(struct ieee80211com *, struct ieee80211_node *, const struct ieee80211_key *); int iwn_wme_update(struct ieee80211com *); @@ -201,6 +199,7 @@ IWN_DEBUG_CALIBRATE = 0x00000200, /* periodic calibration */ IWN_DEBUG_NODE = 0x00000400, /* node management */ IWN_DEBUG_LED = 0x00000800, /* led management */ + IWN_DEBUG_CMD = 0x00001000, /* cmd submission */ IWN_DEBUG_FATAL = 0x80000000, /* fatal errors */ IWN_DEBUG_ANY = 0xffffffff }; @@ -375,8 +374,7 @@ /* set device capabilities */ ic->ic_caps = - IEEE80211_C_WEP /* s/w WEP */ - | IEEE80211_C_MONITOR /* monitor mode supported */ + IEEE80211_C_MONITOR /* monitor mode supported */ | IEEE80211_C_TXPMGT /* tx power management */ | IEEE80211_C_SHSLOT /* short slot time supported */ | IEEE80211_C_WPA @@ -514,10 +512,10 @@ ivp->iv_newstate = vap->iv_newstate; vap->iv_newstate = iwn_newstate; - callout_init(&ivp->iv_amrr_to, CALLOUT_MPSAFE); ieee80211_amrr_init(&ivp->iv_amrr, vap, IEEE80211_AMRR_MIN_SUCCESS_THRESHOLD, - IEEE80211_AMRR_MAX_SUCCESS_THRESHOLD); + IEEE80211_AMRR_MAX_SUCCESS_THRESHOLD, + 500 /*ms*/); /* complete setup */ ieee80211_vap_attach(vap, ieee80211_media_change, ieee80211_media_status); @@ -530,7 +528,7 @@ { struct iwn_vap *ivp = IWN_VAP(vap); - callout_drain(&ivp->iv_amrr_to); + ieee80211_amrr_cleanup(&ivp->iv_amrr); ieee80211_vap_detach(vap); free(ivp, M_80211_VAP); } @@ -948,15 +946,9 @@ iwn_newassoc(struct ieee80211_node *ni, int isnew) { struct ieee80211vap *vap = ni->ni_vap; - int i; - ieee80211_amrr_node_init(&IWN_VAP(vap)->iv_amrr, &IWN_NODE(ni)->amn); - - /* set rate to some reasonable initial value */ - for (i = ni->ni_rates.rs_nrates - 1; - i > 0 && (ni->ni_rates.rs_rates[i] & IEEE80211_RATE_VAL) > 72; - i--); - ni->ni_txrate = i; + ieee80211_amrr_node_init(&IWN_VAP(vap)->iv_amrr, + &IWN_NODE(ni)->amn, ni); } int @@ -973,13 +965,13 @@ struct iwn_vap *ivp = IWN_VAP(vap); struct ieee80211com *ic = vap->iv_ic; struct iwn_softc *sc = ic->ic_ifp->if_softc; + int error; DPRINTF(sc, IWN_DEBUG_STATE, "%s: %s -> %s\n", __func__, ieee80211_state_name[vap->iv_state], ieee80211_state_name[nstate]); callout_stop(&sc->sc_timer_to); - callout_stop(&ivp->iv_amrr_to); /* * Some state transitions require issuing a configure request @@ -989,7 +981,8 @@ */ if (nstate == IEEE80211_S_AUTH && vap->iv_state != IEEE80211_S_AUTH) { /* !AUTH -> AUTH requires adapter config */ - return iwn_queue_cmd(sc, IWN_AUTH, arg, IWN_QUEUE_NORMAL); + error = iwn_queue_cmd(sc, IWN_AUTH, arg, IWN_QUEUE_NORMAL); + return (error != 0 ? error : EINPROGRESS); } if (nstate == IEEE80211_S_RUN && vap->iv_state != IEEE80211_S_RUN) { /* @@ -997,18 +990,14 @@ * which is done with a firmware cmd. We also defer * starting the timers until that work is done. */ - return iwn_queue_cmd(sc, IWN_RUN, arg, IWN_QUEUE_NORMAL); + error = iwn_queue_cmd(sc, IWN_RUN, arg, IWN_QUEUE_NORMAL); + return (error != 0 ? error : EINPROGRESS); } if (nstate == IEEE80211_S_RUN) { - const struct ieee80211_txparam *tp; /* * RUN -> RUN transition; just restart the timers. */ iwn_calib_reset(sc); - tp = &vap->iv_txparms[ - ieee80211_chan2mode(vap->iv_bss->ni_chan)]; - if (tp->ucastrate != IEEE80211_FIXED_RATE_NONE) - iwn_amrr_reset(vap); } return ivp->iv_newstate(vap, nstate, arg); } @@ -1348,34 +1337,6 @@ sc->calib_cnt = 60; /* do calibration every 60s */ } -static void -iwn_amrr_reset(struct ieee80211vap *vap) -{ - /* rate control updated every 500ms */ - callout_reset(&IWN_VAP(vap)->iv_amrr_to, hz / 2, iwn_amrr_timeout, vap); -} - -static void -iwn_amrr_iter_func(void *arg, struct ieee80211_node *ni) -{ - struct ieee80211vap *vap = arg; - - ieee80211_amrr_choose(&IWN_VAP(vap)->iv_amrr, ni, &IWN_NODE(ni)->amn); -} - -static void -iwn_amrr_timeout(void *arg) -{ - struct ieee80211vap *vap = arg; - - if (vap->iv_opmode != IEEE80211_M_STA) { - struct ieee80211com *ic = vap->iv_ic; - ieee80211_iterate_nodes(&ic->ic_sta, iwn_amrr_iter_func, vap); - } else - iwn_amrr_iter_func(vap, vap->iv_bss); - iwn_amrr_reset(vap); -} - void iwn_ampdu_rx_start(struct iwn_softc *sc, struct iwn_rx_desc *desc) { @@ -1598,11 +1559,13 @@ struct iwn_tx_ring *ring = &sc->txq[desc->qid & 0xf]; struct iwn_tx_data *data = &ring->data[desc->idx]; struct iwn_tx_stat *stat = (struct iwn_tx_stat *)(desc + 1); - struct iwn_node *wn = (struct iwn_node *)data->ni; + struct iwn_node *wn = IWN_NODE(data->ni); struct mbuf *m; struct ieee80211_node *ni; uint32_t status; + KASSERT(data->ni != NULL, ("no node")); + DPRINTF(sc, IWN_DEBUG_XMIT, "%s: " "qid %d idx %d retries %d nkill %d rate %x duration %d status %x\n", __func__, desc->qid, desc->idx, stat->ntries, @@ -1612,19 +1575,18 @@ /* * Update rate control statistics for the node. */ - wn->amn.amn_txcnt++; - if (stat->ntries > 0) { - DPRINTF(sc, IWN_DEBUG_XMIT, "%s: ntries %d\n", - __func__, stat->ntries); - wn->amn.amn_retrycnt++; - } - status = le32toh(stat->status) & 0xff; if (status & 0x80) { DPRINTF(sc, IWN_DEBUG_ANY, "%s: status 0x%x\n", __func__, le32toh(stat->status)); ifp->if_oerrors++; + ieee80211_amrr_tx_complete(&wn->amn, + IEEE80211_AMRR_FAILURE, stat->ntries); + } else { + ieee80211_amrr_tx_complete(&wn->amn, + IEEE80211_AMRR_SUCCESS, stat->ntries); } + bus_dmamap_sync(ring->data_dmat, data->map, BUS_DMASYNC_POSTWRITE); bus_dmamap_unload(ring->data_dmat, data->map); @@ -1933,9 +1895,10 @@ rate = tp->mcastrate; else if (tp->ucastrate != IEEE80211_FIXED_RATE_NONE) rate = tp->ucastrate; - else - rate = ni->ni_rates.rs_rates[ni->ni_txrate]; - rate &= IEEE80211_RATE_VAL; + else { + (void) ieee80211_amrr_choose(ni, &IWN_NODE(ni)->amn); + rate = ni->ni_txrate; + } if (wh->i_fc[1] & IEEE80211_FC1_WEP) { k = ieee80211_crypto_encap(ni, m0); @@ -2701,6 +2664,9 @@ htole16(8); } + DPRINTF(sc, IWN_DEBUG_CMD, "%s: %s (0x%x) flags %d qid %d idx %d\n", + __func__, iwn_intr_str(cmd->code), cmd->code, + cmd->flags, cmd->qid, cmd->idx); /* kick cmd ring */ ring->cur = (ring->cur + 1) % IWN_TX_RING_COUNT; @@ -2709,45 +2675,87 @@ return async ? 0 : msleep(cmd, &sc->sc_mtx, PCATCH, "iwncmd", hz); } +static const uint8_t iwn_ridx_to_plcp[] = { + 10, 20, 55, 110, /* CCK */ + 0xd, 0xf, 0x5, 0x7, 0x9, 0xb, 0x1, 0x3, 0x3 /* OFDM R1-R4 */ +}; +static const uint8_t iwn_siso_mcs_to_plcp[] = { + 0, 0, 0, 0, /* CCK */ + 0, 0, 1, 2, 3, 4, 5, 6, 7 /* HT */ +}; +static const uint8_t iwn_mimo_mcs_to_plcp[] = { + 0, 0, 0, 0, /* CCK */ + 8, 8, 9, 10, 11, 12, 13, 14, 15 /* HT */ +}; +static const uint8_t iwn_prev_ridx[] = { + /* NB: allow fallback from CCK11 to OFDM9 and from OFDM6 to CCK5 */ + 0, 0, 1, 5, /* CCK */ + 2, 4, 3, 6, 7, 8, 9, 10, 10 /* OFDM */ +}; + /* - * Configure hardware multi-rate retries for one node. + * Configure hardware link parameters for the specified + * node operating on the specified channel. */ int -iwn_setup_node_mrr(struct iwn_softc *sc, uint8_t id, int async) +iwn_set_link_quality(struct iwn_softc *sc, uint8_t id, + const struct ieee80211_channel *c, int async) { - struct ieee80211com *ic = &sc->sc_ic; - struct iwn_cmd_mrr mrr; + struct iwn_cmd_link_quality lq; int i, ridx; - memset(&mrr, 0, sizeof mrr); - mrr.id = id; - if (ic->ic_bsschan != IEEE80211_CHAN_ANYC && - IEEE80211_IS_CHAN_HT(ic->ic_bsschan)) { - mrr.mimo = 1; - mrr.ssmask = 1; + memset(&lq, 0, sizeof(lq)); + lq.id = id; + if (IEEE80211_IS_CHAN_HT(c)) { + lq.mimo = 1; + lq.ssmask = 0x1; } else - mrr.ssmask = 2; - mrr.dsmask = 3; - mrr.ampdu_disable = 3; - mrr.ampdu_limit = htole16(4000); + lq.ssmask = 0x2; if (id == IWN_ID_BSS) - ridx = IWN_OFDM54; - else if (IEEE80211_IS_CHAN_A(ic->ic_curchan)) - ridx = IWN_OFDM6; + ridx = IWN_RATE_OFDM54; + else if (IEEE80211_IS_CHAN_A(c)) + ridx = IWN_RATE_OFDM6; else - ridx = IWN_CCK1; + ridx = IWN_RATE_CCK1; for (i = 0; i < IWN_MAX_TX_RETRIES; i++) { - mrr.table[i].rate = iwn_ridx_to_plcp[ridx]; - mrr.table[i].rflags = IWN_RFLAG_ANT_B; - if (ridx <= IWN_CCK11) - mrr.table[i].rflags |= IWN_RFLAG_CCK; + /* XXX toggle antenna for retry patterns */ + if (IEEE80211_IS_CHAN_HT40(c)) { + lq.table[i].rate = iwn_mimo_mcs_to_plcp[ridx] + | IWN_RATE_MCS; + lq.table[i].rflags = IWN_RFLAG_HT + | IWN_RFLAG_HT40 + | IWN_RFLAG_ANT_A; + /* XXX shortGI */ + } else if (IEEE80211_IS_CHAN_HT(c)) { + lq.table[i].rate = iwn_siso_mcs_to_plcp[ridx] + | IWN_RATE_MCS; + lq.table[i].rflags = IWN_RFLAG_HT + | IWN_RFLAG_ANT_A; + /* XXX shortGI */ + } else { + lq.table[i].rate = iwn_ridx_to_plcp[ridx]; + if (ridx <= IWN_RATE_CCK11) + lq.table[i].rflags = IWN_RFLAG_CCK; + lq.table[i].rflags |= IWN_RFLAG_ANT_B; + } ridx = iwn_prev_ridx[ridx]; } - DPRINTF(sc, IWN_DEBUG_STATE, - "%s: set MRR for node %d, mimo %d ssmask %d\n", - __func__, id, mrr.mimo, mrr.ssmask); - return iwn_cmd(sc, IWN_CMD_NODE_MRR_SETUP, &mrr, sizeof mrr, async); + + lq.dsmask = 0x3; + lq.ampdu_disable = 3; + lq.ampdu_limit = htole16(4000); +#ifdef IWN_DEBUG + if (sc->sc_debug & IWN_DEBUG_STATE) { + printf("%s: set link quality for node %d, mimo %d ssmask %d\n", + __func__, id, lq.mimo, lq.ssmask); + printf("%s:", __func__); + for (i = 0; i < IWN_MAX_TX_RETRIES; i++) + printf(" %d:%x", lq.table[i].rate, lq.table[i].rflags); + printf("\n"); + } +#endif + return iwn_cmd(sc, IWN_CMD_TX_LINK_QUALITY, &lq, sizeof(lq), async); } #if 0 @@ -3463,6 +3471,7 @@ "%s: could not configure, error %d\n", __func__, error); return error; } + sc->sc_curchan = ic->ic_curchan; /* configuration has changed, set Tx power accordingly */ error = iwn_set_txpower(sc, ni->ni_chan, 1); @@ -3487,7 +3496,7 @@ __func__, error); return error; } - error = iwn_setup_node_mrr(sc, node.id, 1); + error = iwn_set_link_quality(sc, node.id, ic->ic_curchan, 1); if (error != 0) { device_printf(sc->sc_dev, "%s: could not setup MRR for broadcast node, error %d\n", @@ -3508,7 +3517,6 @@ struct ieee80211com *ic = &sc->sc_ic; struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps); /*XXX*/ struct ieee80211_node *ni = vap->iv_bss; - const struct ieee80211_txparam *tp; struct iwn_node_info node; int error, maxrxampdu, ampdudensity; @@ -3538,6 +3546,12 @@ sc->config.flags |= htole32(IWN_CONFIG_HT40D); else sc->config.flags |= htole32(IWN_CONFIG_HT20); + sc->config.rxchain = htole16( + (3 << IWN_RXCHAIN_VALID_S) + | (3 << IWN_RXCHAIN_MIMO_CNT_S) + | (1 << IWN_RXCHAIN_CNT_S) + | IWN_RXCHAIN_MIMO_FORCE); + maxrxampdu = MS(ni->ni_htparam, IEEE80211_HTCAP_MAXRXAMPDU); ampdudensity = MS(ni->ni_htparam, IEEE80211_HTCAP_MPDUDENSITY); } else @@ -3563,6 +3577,7 @@ __func__, error); return error; } + sc->sc_curchan = ni->ni_chan; /* configuration has changed, set Tx power accordingly */ error = iwn_set_txpower(sc, ni->ni_chan, 1); @@ -3577,8 +3592,8 @@ IEEE80211_ADDR_COPY(node.macaddr, ni->ni_macaddr); node.id = IWN_ID_BSS; node.htflags = htole32( - (maxrxampdu << IWN_MAXRXAMPDU_SHIFT) | - (ampdudensity << IWN_MPDUDENSITY_SHIFT)); + (maxrxampdu << IWN_MAXRXAMPDU_S) | + (ampdudensity << IWN_MPDUDENSITY_S)); DPRINTF(sc, IWN_DEBUG_STATE, "%s: add BSS node, id %d htflags 0x%x\n", __func__, node.id, le32toh(node.htflags)); error = iwn_cmd(sc, IWN_CMD_ADD_NODE, &node, sizeof node, 1); @@ -3586,7 +3601,7 @@ device_printf(sc->sc_dev,"could not add BSS node\n"); return error; } - error = iwn_setup_node_mrr(sc, node.id, 1); + error = iwn_set_link_quality(sc, node.id, ni->ni_chan, 1); if (error != 0) { device_printf(sc->sc_dev, "%s: could not setup MRR for node %d, error %d\n", @@ -3614,11 +3629,6 @@ /* link LED always on while associated */ iwn_set_led(sc, IWN_LED_LINK, 0, 1); - /* start rate control timer is not fixed rate */ - tp = &vap->iv_txparms[ieee80211_chan2mode(ni->ni_chan)]; - if (tp->ucastrate != IEEE80211_FIXED_RATE_NONE) - iwn_amrr_reset(vap); - return 0; #undef MS } @@ -3679,7 +3689,7 @@ hdr->plcp_threshold = htole16(1); /* min # of packets */ /* select Ant B and Ant C for scanning */ - hdr->rxchain = htole16(0x3e1 | 7 << IWN_RXCHAIN_ANTMSK_SHIFT); + hdr->rxchain = htole16(0x3e1 | (7 << IWN_RXCHAIN_VALID_S)); tx = (struct iwn_cmd_data *)(hdr + 1); memset(tx, 0, sizeof (struct iwn_cmd_data)); @@ -3691,11 +3701,11 @@ if (IEEE80211_IS_CHAN_A(ic->ic_curchan)) { hdr->crc_threshold = htole16(1); /* send probe requests at 6Mbps */ - tx->rate = iwn_ridx_to_plcp[IWN_OFDM6]; + tx->rate = iwn_ridx_to_plcp[IWN_RATE_OFDM6]; } else { hdr->flags = htole32(IWN_CONFIG_24GHZ | IWN_CONFIG_AUTO); /* send probe requests at 1Mbps */ - tx->rate = iwn_ridx_to_plcp[IWN_CCK1]; + tx->rate = iwn_ridx_to_plcp[IWN_RATE_CCK1]; tx->rflags |= IWN_RFLAG_CCK; } @@ -3883,7 +3893,7 @@ sc->config.ofdm_mask = 0xff; /* not yet negotiated */ sc->config.ht_single_mask = 0xff; sc->config.ht_dual_mask = 0xff; - sc->config.rxchain = htole16(0x2800 | 7 << IWN_RXCHAIN_ANTMSK_SHIFT); + sc->config.rxchain = htole16(0x2800 | (7 << IWN_RXCHAIN_VALID_S)); DPRINTF(sc, IWN_DEBUG_STATE, "%s: config chan %d mode %d flags 0x%x cck 0x%x ofdm 0x%x " @@ -3904,6 +3914,7 @@ __func__, error); return error; } + sc->sc_curchan = ic->ic_curchan; /* configuration has changed, set Tx power accordingly */ error = iwn_set_txpower(sc, ic->ic_curchan, 0); @@ -3926,7 +3937,7 @@ __func__, error); return error; } - error = iwn_setup_node_mrr(sc, node.id, 0); + error = iwn_set_link_quality(sc, node.id, ic->ic_curchan, 0); if (error != 0) { device_printf(sc->sc_dev, "%s: could not setup MRR for node %d, error %d\n", @@ -4285,11 +4296,13 @@ struct iwn_softc *sc = ifp->if_softc; const struct ieee80211_channel *c = ic->ic_curchan; - sc->sc_rxtap.wr_chan_freq = htole16(c->ic_freq); - sc->sc_rxtap.wr_chan_flags = htole16(c->ic_flags); - sc->sc_txtap.wt_chan_freq = htole16(c->ic_freq); - sc->sc_txtap.wt_chan_flags = htole16(c->ic_flags); - iwn_queue_cmd(sc, IWN_SET_CHAN, 0, IWN_QUEUE_NORMAL); + if (c != sc->sc_curchan) { + sc->sc_rxtap.wr_chan_freq = htole16(c->ic_freq); + sc->sc_rxtap.wr_chan_flags = htole16(c->ic_flags); + sc->sc_txtap.wt_chan_freq = htole16(c->ic_freq); + sc->sc_txtap.wt_chan_flags = htole16(c->ic_flags); + iwn_queue_cmd(sc, IWN_SET_CHAN, 0, IWN_QUEUE_NORMAL); + } } /* @@ -4325,6 +4338,7 @@ struct ieee80211com *ic = &sc->sc_ic; struct ieee80211vap *vap; int cmd, arg, error; + enum ieee80211_state nstate; for (;;) { IWN_CMD_LOCK(sc); @@ -4344,7 +4358,7 @@ sc->sc_cmd_cur = (sc->sc_cmd_cur + 1) % IWN_CMD_MAXOPS; IWN_CMD_UNLOCK(sc); - DPRINTF(sc, IWN_DEBUG_OPS, "%s: %s (cmd %d)\n", + DPRINTF(sc, IWN_DEBUG_OPS, "%s: %s (cmd 0x%x)\n", __func__, iwn_ops_str(cmd), cmd); vap = TAILQ_FIRST(&ic->ic_vaps); /* XXX */ @@ -4380,31 +4394,28 @@ } break; case IWN_AUTH: + case IWN_RUN: IWN_LOCK(sc); - error = iwn_auth(sc); - IWN_UNLOCK(sc); - if (error != 0) { - device_printf(sc->sc_dev, - "%s: could not move to auth state, error %d\n", - __func__, error); - return; + if (cmd == IWN_AUTH) { + error = iwn_auth(sc); + nstate = IEEE80211_S_AUTH; + } else { + error = iwn_run(sc); + nstate = IEEE80211_S_RUN; } - IWN_VAP(vap)->iv_newstate(vap, IEEE80211_S_AUTH, arg); - break; - case IWN_RUN: - IWN_LOCK(sc); - error = iwn_run(sc); IWN_UNLOCK(sc); - if (error != 0) { + if (error == 0) { + IEEE80211_LOCK(ic); + IWN_VAP(vap)->iv_newstate(vap, nstate, arg); + if (vap->iv_newstate_cb != NULL) + vap->iv_newstate_cb(vap, nstate, arg); + IEEE80211_UNLOCK(ic); + } else { device_printf(sc->sc_dev, - "%s: could not move to run state, error %d\n", - __func__, error); - return; + "%s: %s state change failed, error %d\n", + __func__, ieee80211_state_name[nstate], + error); } - IWN_VAP(vap)->iv_newstate(vap, IEEE80211_S_RUN, arg); - /* XXX compensate for deferred handling of newstate */ - vap->iv_ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; - if_start(vap->iv_ifp); break; case IWN_REINIT: //XXX DEBUG @@ -4528,7 +4539,7 @@ case IWN_CMD_ASSOCIATE: return "IWN_CMD_ASSOCIATE"; case IWN_CMD_EDCA_PARAMS: return "IWN_CMD_EDCA_PARAMS"; case IWN_CMD_TSF: return "IWN_CMD_TSF"; - case IWN_CMD_NODE_MRR_SETUP: return "IWN_CMD_NODE_MRR_SETUP"; + case IWN_CMD_TX_LINK_QUALITY: return "IWN_CMD_TX_LINK_QUALITY"; case IWN_CMD_SET_LED: return "IWN_CMD_SET_LED"; case IWN_CMD_SET_POWER_MODE: return "IWN_CMD_SET_POWER_MODE"; case IWN_CMD_SCAN: return "IWN_CMD_SCAN"; ==== //depot/projects/vap/sys/dev/iwn/if_iwnreg.h#4 (text+kox) ==== @@ -251,30 +251,29 @@ struct iwn_tx_cmd { uint8_t code; -#define IWN_CMD_CONFIGURE 16 -#define IWN_CMD_ASSOCIATE 17 -#define IWN_CMD_EDCA_PARAMS 19 -#define IWN_CMD_TSF 20 -#define IWN_CMD_ADD_NODE 24 -#define IWN_CMD_TX_DATA 28 -#define IWN_CMD_NODE_MRR_SETUP 78 -#define IWN_CMD_SET_LED 72 -#define IWN_CMD_SET_POWER_MODE 119 -#define IWN_CMD_SCAN 128 -#define IWN_CMD_TXPOWER 151 -#define IWN_CMD_BLUETOOTH 155 -#define IWN_CMD_GET_STATISTICS 156 -#define IWN_CMD_SET_CRITICAL_TEMP 164 -#define IWN_SENSITIVITY 168 -#define IWN_PHY_CALIB 176 - +#define IWN_CMD_CONFIGURE 0x10 /* REPLY_RXON */ +#define IWN_CMD_ASSOCIATE 0x11 /* REPLY_RXON_ASSOC */ +#define IWN_CMD_EDCA_PARAMS 0x13 /* REPLY_QOS_PARAM */ +#define IWN_CMD_TSF 0x14 /* REPLY_RXON_TIMING */ +#define IWN_CMD_ADD_NODE 0x18 /* REPLY_ADD_STA */ +#define IWN_CMD_TX_DATA 0x1c /* REPLY_TX */ +#define IWN_CMD_TX_LINK_QUALITY 0x4e /* REPLY_TX_LINK_QUALITY_CMD */ +#define IWN_CMD_SET_LED 0x48 /* REPLY_LEDS_CMD */ +#define IWN_CMD_SET_POWER_MODE 0x77 /* POWER_TABLE_CMD */ +#define IWN_CMD_SCAN 0x80 /* REPLY_SCAN_CMD */ +#define IWN_CMD_TXPOWER 0x97 /* REPLY_TX_PWR_TABLE_CMD */ +#define IWN_CMD_BLUETOOTH 0x9b /* REPLY_BT_CONFIG */ +#define IWN_CMD_GET_STATISTICS 0x9c /* REPLY_STATISTICS_CMD */ +#define IWN_CMD_SET_CRITICAL_TEMP 0xa4 /* REPLY_CT_KILL_CONFIG_CMD */ +#define IWN_SENSITIVITY 0xa8 /* SENSITIVITY_CMD */ +#define IWN_PHY_CALIB 0xb0 /* REPLY_PHY_CALIBRATION_CMD */ uint8_t flags; uint8_t idx; uint8_t qid; uint8_t data[136]; } __packed; -/* structure for command IWN_CMD_CONFIGURE (NB: RXON) */ +/* structure for command IWN_CMD_CONFIGURE (aka RXON) */ struct iwn_config { uint8_t myaddr[IEEE80211_ADDR_LEN]; uint16_t reserved1; @@ -289,8 +288,18 @@ #define IWN_MODE_MONITOR 6 uint8_t unused4; /* air propagation */ uint16_t rxchain; -#define IWN_RXCHAIN_ANTMSK_SHIFT 1 -#define IWN_RXCHAIN_FORCE_MIMO (1 << 14) +#define IWN_RXCHAIN_VALID 0x000e /* which antennae are valid */ +#define IWN_RXCHAIN_VALID_S 1 +#define IWN_RXCHAIN_FORCE 0x0070 +#define IWN_RXCHAIN_FORCE_S 4 +#define IWN_RXCHAIN_FORCE_MIMO 0x0380 +#define IWN_RXCHAIN_FORCE_MIMO_S 7 +#define IWN_RXCHAIN_CNT 0x0c00 +#define IWN_RXCHAIN_CNT_S 10 +#define IWN_RXCHAIN_MIMO_CNT 0x3000 +#define IWN_RXCHAIN_MIMO_CNT_S 12 +#define IWN_RXCHAIN_MIMO_FORCE 0x4000 +#define IWN_RXCHAIN_MIMO_FORCE_S 14 uint8_t ofdm_mask; /* basic rates */ uint8_t cck_mask; /* basic rates */ uint16_t associd; @@ -362,17 +371,14 @@ struct iwn_node_info { uint8_t control; #define IWN_NODE_UPDATE (1 << 0) - uint8_t reserved1[3]; uint8_t macaddr[IEEE80211_ADDR_LEN]; uint16_t reserved2; uint8_t id; #define IWN_ID_BSS 0 #define IWN_ID_BROADCAST 31 - uint8_t flags; #define IWN_FLAG_SET_KEY (1 << 0) - uint16_t reserved3; uint16_t security; uint8_t tsc2; /* TKIP TSC2 */ @@ -381,17 +387,19 @@ uint16_t reserved5; uint8_t key[IEEE80211_KEYBUF_SIZE]; uint32_t htflags; -#define IWN_MAXRXAMPDU_SHIFT 19 -#define IWN_MPDUDENSITY_SHIFT 23 - +#define IWN_MAXRXAMPDU_S 19 +#define IWN_MPDUDENSITY_S 23 uint32_t mask; uint16_t tid; - uint8_t rate; + uint8_t rate; /* legacy rate/MCS */ +#define IWN_RATE_MCS 0x08 /* or'd to indicate MCS */ uint8_t rflags; -#define IWN_RFLAG_CCK (1 << 1) -#define IWN_RFLAG_ANT_A (1 << 6) -#define IWN_RFLAG_ANT_B (1 << 7) - +#define IWN_RFLAG_HT (1 << 0) /* use HT modulation */ +#define IWN_RFLAG_CCK (1 << 1) /* use CCK modulation */ +#define IWN_RFLAG_HT40 (1 << 3) /* use dual-stream */ +#define IWN_RFLAG_SGI (1 << 5) /* use short GI */ +#define IWN_RFLAG_ANT_A (1 << 6) /* start on antenna port A */ +#define IWN_RFLAG_ANT_B (1 << 7) /* start on antenna port B */ uint8_t add_imm; uint8_t del_imm; uint16_t add_imm_start; @@ -443,9 +451,9 @@ uint16_t txop; } __packed; -/* structure for command IWN_CMD_MRR_NODE_SETUP */ +/* structure for command IWN_CMD_TX_LINK_QUALITY */ #define IWN_MAX_TX_RETRIES 16 -struct iwn_cmd_mrr { +struct iwn_cmd_link_quality { uint8_t id; uint8_t reserved1; uint16_t ctl; @@ -460,10 +468,10 @@ uint32_t reserved2; struct { uint8_t rate; -#define IWN_CCK1 0 -#define IWN_CCK11 3 -#define IWN_OFDM6 4 -#define IWN_OFDM54 11 +#define IWN_RATE_CCK1 0 +#define IWN_RATE_CCK11 3 +#define IWN_RATE_OFDM6 4 +#define IWN_RATE_OFDM54 11 uint8_t rflags; uint16_t xrflags; } table[IWN_MAX_TX_RETRIES]; @@ -888,17 +896,6 @@ struct iwn_eeprom_chan_samples chans[2]; } __packed; -static const uint8_t iwn_ridx_to_plcp[] = { - 10, 20, 55, 110, /* CCK */ - 0xd, 0xf, 0x5, 0x7, 0x9, 0xb, 0x1, 0x3, 0x3 /* OFDM R1-R4 */ -}; - -/* allow fallback from CCK11 to OFDM9 and from OFDM6 to CCK5 */ -static const uint8_t iwn_prev_ridx[] = { - 0, 0, 1, 5, /* CCK */ - 2, 4, 3, 6, 7, 8, 9, 10, 10 /* OFDM */ -}; - #define IWN_MAX_PWR_INDEX 107 /* ==== //depot/projects/vap/sys/dev/iwn/if_iwnvar.h#3 (text+kox) ==== @@ -141,6 +141,7 @@ int sc_debug; struct callout sc_timer_to; /* calib+watchdog timer */ int sc_tx_timer; /* tx watchdog timer/counter */ + const struct ieee80211_channel *sc_curchan; struct iwn_rx_radiotap_header sc_rxtap; int sc_rxtap_len; From owner-p4-projects@FreeBSD.ORG Tue Apr 1 23:34:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EE29C1065673; Tue, 1 Apr 2008 23:34:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ADF85106566B for ; Tue, 1 Apr 2008 23:34:29 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A00CD8FC15 for ; Tue, 1 Apr 2008 23:34:29 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m31NYT8D020309 for ; Tue, 1 Apr 2008 23:34:29 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m31NYTse020307 for perforce@freebsd.org; Tue, 1 Apr 2008 23:34:29 GMT (envelope-from sam@freebsd.org) Date: Tue, 1 Apr 2008 23:34:29 GMT Message-Id: <200804012334.m31NYTse020307@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 139172 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Apr 2008 23:34:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=139172 Change 139172 by sam@sam_ebb on 2008/04/01 23:33:46 after 3+ years format this debug msg, it's not going away any time soon Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_power.c#11 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_power.c#11 (text+ko) ==== @@ -140,7 +140,8 @@ IEEE80211_NODE_SAVEQ_LOCK(ni); while (IF_POLL(&ni->ni_savedq, m) != NULL && M_AGE_GET(m) < IEEE80211_INACT_WAIT) { -IEEE80211_NOTE(vap, IEEE80211_MSG_POWER, ni, "discard frame, age %u", M_AGE_GET(m));/*XXX*/ + IEEE80211_NOTE(vap, IEEE80211_MSG_POWER, ni, + "discard frame, age %u", M_AGE_GET(m)); _IEEE80211_NODE_SAVEQ_DEQUEUE_HEAD(ni, m); m_freem(m); discard++; From owner-p4-projects@FreeBSD.ORG Tue Apr 1 23:58:56 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EE7131065671; Tue, 1 Apr 2008 23:58:55 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AD9D7106566B for ; Tue, 1 Apr 2008 23:58:55 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9FC318FC23 for ; Tue, 1 Apr 2008 23:58:55 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m31NwthO021117 for ; Tue, 1 Apr 2008 23:58:55 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m31NwtVm021115 for perforce@freebsd.org; Tue, 1 Apr 2008 23:58:55 GMT (envelope-from sam@freebsd.org) Date: Tue, 1 Apr 2008 23:58:55 GMT Message-Id: <200804012358.m31NwtVm021115@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 139173 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Apr 2008 23:58:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=139173 Change 139173 by sam@sam_ebb on 2008/04/01 23:58:34 stick packet on the vap's snd q in response to ps-poll; was still pushing them to the parent snd q as we did pre-vap Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_hostap.c#19 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_hostap.c#19 (text+ko) ==== @@ -2174,6 +2174,7 @@ { struct ieee80211vap *vap = ni->ni_vap; struct ieee80211_frame_min *wh; + struct ifnet *ifp = vap->iv_ifp; struct mbuf *m; uint16_t aid; int qlen; @@ -2230,5 +2231,6 @@ vap->iv_set_tim(ni, 0); } m->m_flags |= M_PWR_SAV; /* bypass PS handling */ - IF_ENQUEUE(&vap->iv_ic->ic_ifp->if_snd, m); + IF_ENQUEUE(&ifp->if_snd, m); + if_start(ifp); } From owner-p4-projects@FreeBSD.ORG Wed Apr 2 00:34:36 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C88401065673; Wed, 2 Apr 2008 00:34:35 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 87B62106564A for ; Wed, 2 Apr 2008 00:34:35 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 797DE8FC15 for ; Wed, 2 Apr 2008 00:34:35 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m320YZbR024250 for ; Wed, 2 Apr 2008 00:34:35 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m320YZml024248 for perforce@freebsd.org; Wed, 2 Apr 2008 00:34:35 GMT (envelope-from sam@freebsd.org) Date: Wed, 2 Apr 2008 00:34:35 GMT Message-Id: <200804020034.m320YZml024248@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 139175 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Apr 2008 00:34:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=139175 Change 139175 by sam@sam_ebb on 2008/04/02 00:33:34 preserve ifr_flagshigh when futzing with the ifnet flags Submitted by: Alexey Popov Affected files ... .. //depot/projects/vap/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#8 edit Differences ... ==== //depot/projects/vap/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#8 (text+ko) ==== @@ -134,7 +134,7 @@ perror("SIOCGIFFLAGS"); return errno; } - *flags = ifr.ifr_flags & 0xffff; + *flags = (ifr.ifr_flags & 0xffff) | (ifr.ifr_flagshigh << 16); return 0; } @@ -146,6 +146,7 @@ memset(&ifr, 0, sizeof(ifr)); strncpy(ifr.ifr_name, drv->ifname, sizeof (ifr.ifr_name)); ifr.ifr_flags = flags & 0xffff; + ifr.ifr_flagshigh = flags >> 16; if (ioctl(drv->sock, SIOCSIFFLAGS, (caddr_t)&ifr) < 0) { perror("SIOCSIFFLAGS"); return errno; From owner-p4-projects@FreeBSD.ORG Wed Apr 2 06:38:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D81BB1065670; Wed, 2 Apr 2008 06:38:15 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 958C3106564A for ; Wed, 2 Apr 2008 06:38:15 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 837C18FC1B for ; Wed, 2 Apr 2008 06:38:15 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m326cF7j061823 for ; Wed, 2 Apr 2008 06:38:15 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m326cE16061816 for perforce@freebsd.org; Wed, 2 Apr 2008 06:38:14 GMT (envelope-from imp@freebsd.org) Date: Wed, 2 Apr 2008 06:38:14 GMT Message-Id: <200804020638.m326cE16061816@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 139187 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Apr 2008 06:38:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=139187 Change 139187 by imp@imp_paco-paco on 2008/04/02 06:37:58 IFC @139185 Affected files ... .. //depot/projects/arm/src/Makefile#18 integrate .. //depot/projects/arm/src/Makefile.inc1#36 integrate .. //depot/projects/arm/src/ObsoleteFiles.inc#35 integrate .. //depot/projects/arm/src/cddl/Makefile.inc#4 integrate .. //depot/projects/arm/src/cddl/compat/opensolaris/include/alloca.h#1 branch .. //depot/projects/arm/src/cddl/compat/opensolaris/include/devid.h#1 branch .. //depot/projects/arm/src/cddl/compat/opensolaris/include/fcntl.h#1 branch .. //depot/projects/arm/src/cddl/compat/opensolaris/include/fsshare.h#1 branch .. //depot/projects/arm/src/cddl/compat/opensolaris/include/libintl.h#1 branch .. //depot/projects/arm/src/cddl/compat/opensolaris/include/mnttab.h#1 branch .. //depot/projects/arm/src/cddl/compat/opensolaris/include/priv.h#1 branch .. //depot/projects/arm/src/cddl/compat/opensolaris/include/solaris.h#1 branch .. //depot/projects/arm/src/cddl/compat/opensolaris/include/stdio.h#1 branch .. //depot/projects/arm/src/cddl/compat/opensolaris/include/stdlib.h#1 branch .. //depot/projects/arm/src/cddl/compat/opensolaris/include/strings.h#1 branch .. //depot/projects/arm/src/cddl/compat/opensolaris/include/unistd.h#1 branch .. //depot/projects/arm/src/cddl/compat/opensolaris/include/zone.h#1 branch .. //depot/projects/arm/src/cddl/compat/opensolaris/lib/libumem/umem.c#1 branch .. //depot/projects/arm/src/cddl/compat/opensolaris/lib/libumem/umem.h#1 branch .. //depot/projects/arm/src/cddl/compat/opensolaris/misc/deviceid.c#1 branch .. //depot/projects/arm/src/cddl/compat/opensolaris/misc/fsshare.c#1 branch .. //depot/projects/arm/src/cddl/compat/opensolaris/misc/mkdirp.c#1 branch .. //depot/projects/arm/src/cddl/compat/opensolaris/misc/mnttab.c#1 branch .. //depot/projects/arm/src/cddl/compat/opensolaris/misc/zmount.c#1 branch .. //depot/projects/arm/src/cddl/compat/opensolaris/misc/zone.c#1 branch .. //depot/projects/arm/src/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/zdb/zdb.8#1 branch .. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/zdb/zdb.c#1 branch .. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c#1 branch .. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/zfs/zfs.8#1 branch .. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c#1 branch .. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h#1 branch .. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c#1 branch .. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/zfs/zfs_util.h#1 branch .. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/zpool/zpool.8#1 branch .. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/zpool/zpool_iter.c#1 branch .. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c#1 branch .. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/zpool/zpool_util.c#1 branch .. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h#1 branch .. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c#1 branch .. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/ztest/ztest.c#1 branch .. //depot/projects/arm/src/cddl/contrib/opensolaris/head/assert.h#1 branch .. //depot/projects/arm/src/cddl/contrib/opensolaris/head/atomic.h#1 branch .. //depot/projects/arm/src/cddl/contrib/opensolaris/head/libintl.h#1 branch .. //depot/projects/arm/src/cddl/contrib/opensolaris/head/stdio_ext.h#1 branch .. //depot/projects/arm/src/cddl/contrib/opensolaris/head/synch.h#1 branch .. //depot/projects/arm/src/cddl/contrib/opensolaris/head/thread.h#1 branch .. //depot/projects/arm/src/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c#1 branch .. //depot/projects/arm/src/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.h#1 branch .. //depot/projects/arm/src/cddl/contrib/opensolaris/lib/libnvpair/nvpair_alloc_system.c#1 branch .. //depot/projects/arm/src/cddl/contrib/opensolaris/lib/libuutil/common/libuutil.h#1 branch .. //depot/projects/arm/src/cddl/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#1 branch .. //depot/projects/arm/src/cddl/contrib/opensolaris/lib/libuutil/common/libuutil_impl.h#1 branch .. //depot/projects/arm/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#1 branch .. //depot/projects/arm/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_avl.c#1 branch .. //depot/projects/arm/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c#1 branch .. //depot/projects/arm/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_ident.c#1 branch .. //depot/projects/arm/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_list.c#1 branch .. //depot/projects/arm/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_misc.c#1 branch .. //depot/projects/arm/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_open.c#1 branch .. //depot/projects/arm/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_pname.c#1 branch .. //depot/projects/arm/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_strtoint.c#1 branch .. //depot/projects/arm/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h#1 branch .. //depot/projects/arm/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#1 branch .. //depot/projects/arm/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#1 branch .. //depot/projects/arm/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#1 branch .. //depot/projects/arm/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#1 branch .. //depot/projects/arm/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#1 branch .. //depot/projects/arm/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#1 branch .. //depot/projects/arm/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#1 branch .. //depot/projects/arm/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#1 branch .. //depot/projects/arm/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#1 branch .. //depot/projects/arm/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#1 branch .. //depot/projects/arm/src/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c#1 branch .. //depot/projects/arm/src/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#1 branch .. //depot/projects/arm/src/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c#1 branch .. //depot/projects/arm/src/cddl/contrib/opensolaris/lib/libzpool/common/util.c#1 branch .. //depot/projects/arm/src/cddl/lib/Makefile#6 integrate .. //depot/projects/arm/src/cddl/lib/libavl/Makefile#3 integrate .. //depot/projects/arm/src/cddl/lib/libnvpair/Makefile#4 integrate .. //depot/projects/arm/src/cddl/lib/libumem/Makefile#3 integrate .. //depot/projects/arm/src/cddl/lib/libuutil/Makefile#3 integrate .. //depot/projects/arm/src/cddl/lib/libzfs/Makefile#4 integrate .. //depot/projects/arm/src/cddl/lib/libzpool/Makefile#4 integrate .. //depot/projects/arm/src/cddl/sbin/zfs/Makefile#4 integrate .. //depot/projects/arm/src/cddl/sbin/zpool/Makefile#4 integrate .. //depot/projects/arm/src/cddl/usr.bin/Makefile#6 integrate .. //depot/projects/arm/src/cddl/usr.bin/ztest/Makefile#4 integrate .. //depot/projects/arm/src/cddl/usr.sbin/Makefile#6 integrate .. //depot/projects/arm/src/cddl/usr.sbin/zdb/Makefile#4 integrate .. //depot/projects/arm/src/compat/opensolaris/include/alloca.h#2 delete .. //depot/projects/arm/src/compat/opensolaris/include/devid.h#3 delete .. //depot/projects/arm/src/compat/opensolaris/include/fcntl.h#2 delete .. //depot/projects/arm/src/compat/opensolaris/include/fsshare.h#2 delete .. //depot/projects/arm/src/compat/opensolaris/include/libintl.h#2 delete .. //depot/projects/arm/src/compat/opensolaris/include/mnttab.h#2 delete .. //depot/projects/arm/src/compat/opensolaris/include/priv.h#2 delete .. //depot/projects/arm/src/compat/opensolaris/include/solaris.h#2 delete .. //depot/projects/arm/src/compat/opensolaris/include/stdio.h#2 delete .. //depot/projects/arm/src/compat/opensolaris/include/stdlib.h#2 delete .. //depot/projects/arm/src/compat/opensolaris/include/strings.h#2 delete .. //depot/projects/arm/src/compat/opensolaris/include/unistd.h#2 delete .. //depot/projects/arm/src/compat/opensolaris/include/zone.h#2 delete .. //depot/projects/arm/src/compat/opensolaris/lib/libumem/umem.c#2 delete .. //depot/projects/arm/src/compat/opensolaris/lib/libumem/umem.h#2 delete .. //depot/projects/arm/src/compat/opensolaris/misc/deviceid.c#2 delete .. //depot/projects/arm/src/compat/opensolaris/misc/fsshare.c#3 delete .. //depot/projects/arm/src/compat/opensolaris/misc/mkdirp.c#2 delete .. //depot/projects/arm/src/compat/opensolaris/misc/mnttab.c#2 delete .. //depot/projects/arm/src/compat/opensolaris/misc/zmount.c#2 delete .. //depot/projects/arm/src/compat/opensolaris/misc/zone.c#2 delete .. //depot/projects/arm/src/contrib/netcat/nc.1#3 integrate .. //depot/projects/arm/src/contrib/netcat/netcat.c#4 integrate .. //depot/projects/arm/src/contrib/opensolaris/OPENSOLARIS.LICENSE#2 delete .. //depot/projects/arm/src/contrib/opensolaris/cmd/zdb/zdb.8#3 delete .. //depot/projects/arm/src/contrib/opensolaris/cmd/zdb/zdb.c#4 delete .. //depot/projects/arm/src/contrib/opensolaris/cmd/zdb/zdb_il.c#2 delete .. //depot/projects/arm/src/contrib/opensolaris/cmd/zfs/zfs.8#3 delete .. //depot/projects/arm/src/contrib/opensolaris/cmd/zfs/zfs_iter.c#2 delete .. //depot/projects/arm/src/contrib/opensolaris/cmd/zfs/zfs_iter.h#2 delete .. //depot/projects/arm/src/contrib/opensolaris/cmd/zfs/zfs_main.c#3 delete .. //depot/projects/arm/src/contrib/opensolaris/cmd/zfs/zfs_util.h#2 delete .. //depot/projects/arm/src/contrib/opensolaris/cmd/zpool/zpool.8#3 delete .. //depot/projects/arm/src/contrib/opensolaris/cmd/zpool/zpool_iter.c#2 delete .. //depot/projects/arm/src/contrib/opensolaris/cmd/zpool/zpool_main.c#2 delete .. //depot/projects/arm/src/contrib/opensolaris/cmd/zpool/zpool_util.c#2 delete .. //depot/projects/arm/src/contrib/opensolaris/cmd/zpool/zpool_util.h#2 delete .. //depot/projects/arm/src/contrib/opensolaris/cmd/zpool/zpool_vdev.c#3 delete .. //depot/projects/arm/src/contrib/opensolaris/cmd/ztest/ztest.c#3 delete .. //depot/projects/arm/src/contrib/opensolaris/head/assert.h#2 delete .. //depot/projects/arm/src/contrib/opensolaris/head/atomic.h#2 delete .. //depot/projects/arm/src/contrib/opensolaris/head/libintl.h#2 delete .. //depot/projects/arm/src/contrib/opensolaris/head/stdio_ext.h#2 delete .. //depot/projects/arm/src/contrib/opensolaris/head/synch.h#2 delete .. //depot/projects/arm/src/contrib/opensolaris/head/thread.h#2 delete .. //depot/projects/arm/src/contrib/opensolaris/lib/libnvpair/libnvpair.c#2 delete .. //depot/projects/arm/src/contrib/opensolaris/lib/libnvpair/libnvpair.h#2 delete .. //depot/projects/arm/src/contrib/opensolaris/lib/libnvpair/nvpair_alloc_system.c#2 delete .. //depot/projects/arm/src/contrib/opensolaris/lib/libuutil/common/libuutil.h#2 delete .. //depot/projects/arm/src/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#2 delete .. //depot/projects/arm/src/contrib/opensolaris/lib/libuutil/common/libuutil_impl.h#2 delete .. //depot/projects/arm/src/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#2 delete .. //depot/projects/arm/src/contrib/opensolaris/lib/libuutil/common/uu_avl.c#2 delete .. //depot/projects/arm/src/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c#2 delete .. //depot/projects/arm/src/contrib/opensolaris/lib/libuutil/common/uu_ident.c#2 delete .. //depot/projects/arm/src/contrib/opensolaris/lib/libuutil/common/uu_list.c#2 delete .. //depot/projects/arm/src/contrib/opensolaris/lib/libuutil/common/uu_misc.c#2 delete .. //depot/projects/arm/src/contrib/opensolaris/lib/libuutil/common/uu_open.c#2 delete .. //depot/projects/arm/src/contrib/opensolaris/lib/libuutil/common/uu_pname.c#2 delete .. //depot/projects/arm/src/contrib/opensolaris/lib/libuutil/common/uu_strtoint.c#2 delete .. //depot/projects/arm/src/contrib/opensolaris/lib/libzfs/common/libzfs.h#3 delete .. //depot/projects/arm/src/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#3 delete .. //depot/projects/arm/src/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#3 delete .. //depot/projects/arm/src/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#3 delete .. //depot/projects/arm/src/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#2 delete .. //depot/projects/arm/src/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#2 delete .. //depot/projects/arm/src/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#3 delete .. //depot/projects/arm/src/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#2 delete .. //depot/projects/arm/src/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#2 delete .. //depot/projects/arm/src/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#2 delete .. //depot/projects/arm/src/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#2 delete .. //depot/projects/arm/src/contrib/opensolaris/lib/libzpool/common/kernel.c#3 delete .. //depot/projects/arm/src/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#6 delete .. //depot/projects/arm/src/contrib/opensolaris/lib/libzpool/common/taskq.c#2 delete .. //depot/projects/arm/src/contrib/opensolaris/lib/libzpool/common/util.c#2 delete .. //depot/projects/arm/src/contrib/pf/pfctl/pfctl_altq.c#4 integrate .. //depot/projects/arm/src/contrib/pf/pfctl/pfctl_qstats.c#2 integrate .. //depot/projects/arm/src/etc/network.subr#10 integrate .. //depot/projects/arm/src/etc/newsyslog.conf#2 integrate .. //depot/projects/arm/src/etc/rc.d/ppp#7 integrate .. //depot/projects/arm/src/games/fortune/datfiles/fortunes#18 integrate .. //depot/projects/arm/src/gnu/usr.bin/gdb/kgdb/kld.c#2 integrate .. //depot/projects/arm/src/gnu/usr.bin/gdb/kgdb/main.c#3 integrate .. //depot/projects/arm/src/include/complex.h#3 integrate .. //depot/projects/arm/src/include/stdio.h#3 integrate .. //depot/projects/arm/src/include/unistd.h#5 integrate .. //depot/projects/arm/src/lib/libarchive/archive_entry_private.h#3 integrate .. //depot/projects/arm/src/lib/libc/gen/Makefile.inc#7 integrate .. //depot/projects/arm/src/lib/libc/gen/modf.3#3 integrate .. //depot/projects/arm/src/lib/libc/gen/sysctl.3#6 integrate .. //depot/projects/arm/src/lib/libc/rpc/svc_vc.c#3 integrate .. //depot/projects/arm/src/lib/libc/stdtime/localtime.c#4 integrate .. //depot/projects/arm/src/lib/libc/sys/Makefile.inc#11 integrate .. //depot/projects/arm/src/lib/libc/sys/Symbol.map#9 integrate .. //depot/projects/arm/src/lib/libc/sys/cpuset.2#1 branch .. //depot/projects/arm/src/lib/libc/sys/cpuset_getaffinity.2#1 branch .. //depot/projects/arm/src/lib/libc/sys/mincore.2#3 integrate .. //depot/projects/arm/src/lib/libc/xdr/xdr_rec.c#2 integrate .. //depot/projects/arm/src/lib/libthr/Makefile#12 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_cond.c#5 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_private.h#12 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_rwlock.c#2 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_umtx.c#9 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_umtx.h#8 integrate .. //depot/projects/arm/src/lib/msun/Makefile#8 integrate .. //depot/projects/arm/src/lib/msun/Symbol.map#6 integrate .. //depot/projects/arm/src/lib/msun/amd64/Makefile.inc#4 integrate .. //depot/projects/arm/src/lib/msun/amd64/e_remainderl.S#1 branch .. //depot/projects/arm/src/lib/msun/amd64/s_remquol.S#1 branch .. //depot/projects/arm/src/lib/msun/i387/Makefile.inc#4 integrate .. //depot/projects/arm/src/lib/msun/i387/e_remainderl.S#1 branch .. //depot/projects/arm/src/lib/msun/i387/s_remquol.S#1 branch .. //depot/projects/arm/src/lib/msun/man/csqrt.3#2 integrate .. //depot/projects/arm/src/lib/msun/man/hypot.3#4 integrate .. //depot/projects/arm/src/lib/msun/man/remainder.3#3 integrate .. //depot/projects/arm/src/lib/msun/src/e_hypot.c#3 integrate .. //depot/projects/arm/src/lib/msun/src/e_hypotf.c#3 integrate .. //depot/projects/arm/src/lib/msun/src/e_hypotl.c#1 branch .. //depot/projects/arm/src/lib/msun/src/e_log.c#4 integrate .. //depot/projects/arm/src/lib/msun/src/e_logf.c#3 integrate .. //depot/projects/arm/src/lib/msun/src/e_remainder.c#3 integrate .. //depot/projects/arm/src/lib/msun/src/e_remainderl.c#1 branch .. //depot/projects/arm/src/lib/msun/src/math.h#5 integrate .. //depot/projects/arm/src/lib/msun/src/s_csqrt.c#2 integrate .. //depot/projects/arm/src/lib/msun/src/s_csqrtl.c#1 branch .. //depot/projects/arm/src/lib/msun/src/s_expm1.c#3 integrate .. //depot/projects/arm/src/lib/msun/src/s_expm1f.c#3 integrate .. //depot/projects/arm/src/lib/msun/src/s_fmaf.c#2 integrate .. //depot/projects/arm/src/lib/msun/src/s_log1p.c#3 integrate .. //depot/projects/arm/src/lib/msun/src/s_log1pf.c#3 integrate .. //depot/projects/arm/src/lib/msun/src/s_remquo.c#2 integrate .. //depot/projects/arm/src/lib/msun/src/s_remquol.c#1 branch .. //depot/projects/arm/src/lib/msun/src/w_cabs.c#3 integrate .. //depot/projects/arm/src/lib/msun/src/w_cabsl.c#1 branch .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#28 integrate .. //depot/projects/arm/src/rescue/rescue/Makefile#10 integrate .. //depot/projects/arm/src/sbin/dhclient/dhclient-script#6 integrate .. //depot/projects/arm/src/sbin/ggate/Makefile#6 integrate .. //depot/projects/arm/src/sbin/ifconfig/ifclone.c#3 integrate .. //depot/projects/arm/src/sbin/ifconfig/ifconfig.c#13 integrate .. //depot/projects/arm/src/sbin/ifconfig/ifconfig.h#4 integrate .. //depot/projects/arm/src/sbin/ifconfig/ifvlan.c#2 integrate .. //depot/projects/arm/src/share/man/man3/Makefile#5 integrate .. //depot/projects/arm/src/share/man/man4/Makefile#23 integrate .. //depot/projects/arm/src/share/man/man4/arcmsr.4#3 integrate .. //depot/projects/arm/src/share/man/man4/ng_pptpgre.4#2 integrate .. //depot/projects/arm/src/share/man/man4/ubsa.4#6 integrate .. //depot/projects/arm/src/share/man/man5/rc.conf.5#18 integrate .. //depot/projects/arm/src/share/man/man5/src.conf.5#14 integrate .. //depot/projects/arm/src/share/man/man8/rc.subr.8#6 integrate .. //depot/projects/arm/src/share/man/man9/Makefile#19 integrate .. //depot/projects/arm/src/share/man/man9/lock.9#9 integrate .. //depot/projects/arm/src/share/man/man9/rwlock.9#8 integrate .. //depot/projects/arm/src/share/mk/bsd.own.mk#19 integrate .. //depot/projects/arm/src/sys/amd64/amd64/pmap.c#40 integrate .. //depot/projects/arm/src/sys/amd64/conf/GENERIC#29 integrate .. //depot/projects/arm/src/sys/amd64/conf/NOTES#21 integrate .. //depot/projects/arm/src/sys/amd64/include/clock.h#8 integrate .. //depot/projects/arm/src/sys/amd64/include/param.h#6 integrate .. //depot/projects/arm/src/sys/amd64/include/timerreg.h#2 integrate .. //depot/projects/arm/src/sys/amd64/isa/clock.c#18 integrate .. //depot/projects/arm/src/sys/arm/conf/AVILA#20 integrate .. //depot/projects/arm/src/sys/arm/conf/BWCT#6 integrate .. //depot/projects/arm/src/sys/arm/conf/CRB#3 integrate .. //depot/projects/arm/src/sys/arm/conf/EP80219#5 integrate .. //depot/projects/arm/src/sys/arm/conf/HL200#2 integrate .. //depot/projects/arm/src/sys/arm/conf/IQ31244#8 integrate .. //depot/projects/arm/src/sys/arm/conf/KB920X#47 integrate .. //depot/projects/arm/src/sys/arm/conf/SIMICS#8 integrate .. //depot/projects/arm/src/sys/arm/conf/SKYEYE#9 integrate .. //depot/projects/arm/src/sys/arm/include/param.h#4 integrate .. //depot/projects/arm/src/sys/boot/forth/loader.conf#17 integrate .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/kern/opensolaris_kstat.c#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/kern/opensolaris_string.c#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/kern/opensolaris_zone.c#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/machine/endian.h#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/rpc/xdr.h#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/sys/acl.h#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/sys/atomic.h#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/sys/bitmap.h#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/sys/byteorder.h#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/sys/callb.h#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/sys/cmn_err.h#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/sys/cpupart.h#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/sys/cpuvar.h#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/sys/cred.h#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/sys/cyclic.h#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/sys/debug.h#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/sys/dirent.h#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/sys/dkio.h#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/sys/dnlc.h#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/sys/elf.h#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/sys/kcondvar.h#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/sys/kmem.h#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/sys/kobj.h#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/sys/kstat.h#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/sys/lock.h#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/sys/misc.h#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/sys/mman.h#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/sys/mntent.h#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/sys/mnttab.h#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/sys/modctl.h#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/sys/mount.h#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/sys/mutex.h#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/sys/objfs.h#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/sys/param.h#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/sys/pcpu.h#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/sys/policy.h#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/sys/proc.h#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/sys/random.h#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/sys/rwlock.h#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/sys/sdt.h#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/sys/stat.h#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/sys/string.h#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/sys/sunddi.h#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/sys/sysmacros.h#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/sys/systm.h#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/sys/taskq.h#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/sys/taskq_impl.h#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/sys/time.h#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/sys/types.h#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/sys/uio.h#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/sys/varargs.h#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/sys/vfs.h#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/sys/vnode.h#1 branch .. //depot/projects/arm/src/sys/cddl/compat/opensolaris/sys/zone.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/common/atomic/i386/atomic.S#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/common/atomic/ia64/atomic.S#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/common/avl/avl.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/Makefile.files#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bplist.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/gzip.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sha256.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/unique.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/os/callb.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/os/list.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/os/taskq.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_array.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_mem.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/sys/asm_linkage.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/sys/avl_impl.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/sys/bitmap.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/sys/byteorder.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/sys/callb.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/sys/ccompile.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/sys/compress.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/sys/cred.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/sys/dkio.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/sys/dklabel.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/sys/errorq.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/sys/feature_tests.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/sys/fm/protocol.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/sys/fm/util.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/sys/gfs.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/sys/list.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/sys/list_impl.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/sys/note.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair_impl.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/sys/processor.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/sys/procset.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/sys/sdt.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/sys/synch.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/sys/vmem.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/sys/zmod.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/zmod/adler32.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/zmod/deflate.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/zmod/deflate.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inffast.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inffast.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inffixed.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inflate.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inflate.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inftrees.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inftrees.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/zmod/trees.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zconf.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zlib.h#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod_subr.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zutil.c#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zutil.h#1 branch .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_misc.c#21 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_proto.h#27 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_syscall.h#27 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_syscalls.c#27 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_sysent.c#27 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/syscalls.master#28 integrate .. //depot/projects/arm/src/sys/compat/linprocfs/linprocfs.c#24 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_uid16.c#6 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_util.c#6 integrate .. //depot/projects/arm/src/sys/compat/opensolaris/kern/opensolaris_atomic.c#2 delete .. //depot/projects/arm/src/sys/compat/opensolaris/kern/opensolaris_kmem.c#4 delete .. //depot/projects/arm/src/sys/compat/opensolaris/kern/opensolaris_kobj.c#5 delete .. //depot/projects/arm/src/sys/compat/opensolaris/kern/opensolaris_kstat.c#3 delete .. //depot/projects/arm/src/sys/compat/opensolaris/kern/opensolaris_misc.c#3 delete .. //depot/projects/arm/src/sys/compat/opensolaris/kern/opensolaris_policy.c#3 delete .. //depot/projects/arm/src/sys/compat/opensolaris/kern/opensolaris_string.c#3 delete .. //depot/projects/arm/src/sys/compat/opensolaris/kern/opensolaris_vfs.c#6 delete .. //depot/projects/arm/src/sys/compat/opensolaris/kern/opensolaris_zone.c#2 delete .. //depot/projects/arm/src/sys/compat/opensolaris/machine/endian.h#2 delete .. //depot/projects/arm/src/sys/compat/opensolaris/rpc/xdr.h#3 delete .. //depot/projects/arm/src/sys/compat/opensolaris/sys/acl.h#2 delete .. //depot/projects/arm/src/sys/compat/opensolaris/sys/atomic.h#3 delete .. //depot/projects/arm/src/sys/compat/opensolaris/sys/bitmap.h#2 delete .. //depot/projects/arm/src/sys/compat/opensolaris/sys/byteorder.h#2 delete .. //depot/projects/arm/src/sys/compat/opensolaris/sys/callb.h#2 delete .. //depot/projects/arm/src/sys/compat/opensolaris/sys/cmn_err.h#2 delete .. //depot/projects/arm/src/sys/compat/opensolaris/sys/cpupart.h#2 delete .. //depot/projects/arm/src/sys/compat/opensolaris/sys/cpuvar.h#2 delete .. //depot/projects/arm/src/sys/compat/opensolaris/sys/cred.h#2 delete .. //depot/projects/arm/src/sys/compat/opensolaris/sys/cyclic.h#2 delete .. //depot/projects/arm/src/sys/compat/opensolaris/sys/debug.h#2 delete .. //depot/projects/arm/src/sys/compat/opensolaris/sys/dirent.h#2 delete .. //depot/projects/arm/src/sys/compat/opensolaris/sys/dkio.h#2 delete .. //depot/projects/arm/src/sys/compat/opensolaris/sys/dnlc.h#2 delete .. //depot/projects/arm/src/sys/compat/opensolaris/sys/elf.h#2 delete .. //depot/projects/arm/src/sys/compat/opensolaris/sys/kcondvar.h#3 delete .. //depot/projects/arm/src/sys/compat/opensolaris/sys/kmem.h#4 delete .. //depot/projects/arm/src/sys/compat/opensolaris/sys/kobj.h#2 delete .. //depot/projects/arm/src/sys/compat/opensolaris/sys/kstat.h#2 delete .. //depot/projects/arm/src/sys/compat/opensolaris/sys/lock.h#2 delete .. //depot/projects/arm/src/sys/compat/opensolaris/sys/misc.h#3 delete .. //depot/projects/arm/src/sys/compat/opensolaris/sys/mman.h#2 delete .. //depot/projects/arm/src/sys/compat/opensolaris/sys/mntent.h#2 delete .. //depot/projects/arm/src/sys/compat/opensolaris/sys/mnttab.h#2 delete .. //depot/projects/arm/src/sys/compat/opensolaris/sys/modctl.h#2 delete .. //depot/projects/arm/src/sys/compat/opensolaris/sys/mount.h#2 delete .. //depot/projects/arm/src/sys/compat/opensolaris/sys/mutex.h#5 delete .. //depot/projects/arm/src/sys/compat/opensolaris/sys/objfs.h#2 delete .. //depot/projects/arm/src/sys/compat/opensolaris/sys/param.h#2 delete .. //depot/projects/arm/src/sys/compat/opensolaris/sys/pcpu.h#2 delete .. //depot/projects/arm/src/sys/compat/opensolaris/sys/policy.h#2 delete .. //depot/projects/arm/src/sys/compat/opensolaris/sys/proc.h#5 delete .. //depot/projects/arm/src/sys/compat/opensolaris/sys/random.h#2 delete .. //depot/projects/arm/src/sys/compat/opensolaris/sys/rwlock.h#5 delete .. //depot/projects/arm/src/sys/compat/opensolaris/sys/sdt.h#2 delete .. //depot/projects/arm/src/sys/compat/opensolaris/sys/stat.h#2 delete .. //depot/projects/arm/src/sys/compat/opensolaris/sys/string.h#3 delete .. //depot/projects/arm/src/sys/compat/opensolaris/sys/sunddi.h#2 delete .. //depot/projects/arm/src/sys/compat/opensolaris/sys/sysmacros.h#2 delete .. //depot/projects/arm/src/sys/compat/opensolaris/sys/systm.h#2 delete .. //depot/projects/arm/src/sys/compat/opensolaris/sys/taskq.h#2 delete .. //depot/projects/arm/src/sys/compat/opensolaris/sys/taskq_impl.h#2 delete .. //depot/projects/arm/src/sys/compat/opensolaris/sys/time.h#3 delete .. //depot/projects/arm/src/sys/compat/opensolaris/sys/types.h#4 delete .. //depot/projects/arm/src/sys/compat/opensolaris/sys/uio.h#2 delete .. //depot/projects/arm/src/sys/compat/opensolaris/sys/varargs.h#2 delete .. //depot/projects/arm/src/sys/compat/opensolaris/sys/vfs.h#3 delete .. //depot/projects/arm/src/sys/compat/opensolaris/sys/vnode.h#5 delete .. //depot/projects/arm/src/sys/compat/opensolaris/sys/zone.h#2 delete .. //depot/projects/arm/src/sys/compat/pecoff/imgact_pecoff.c#5 integrate .. //depot/projects/arm/src/sys/compat/svr4/svr4_sysvec.c#5 integrate .. //depot/projects/arm/src/sys/conf/NOTES#61 integrate .. //depot/projects/arm/src/sys/conf/files#87 integrate .. //depot/projects/arm/src/sys/conf/options#57 integrate .. //depot/projects/arm/src/sys/conf/options.amd64#8 integrate .. //depot/projects/arm/src/sys/conf/options.i386#11 integrate .. //depot/projects/arm/src/sys/conf/options.pc98#9 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/OPENSOLARIS.LICENSE#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/common/acl/acl_common.c#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/common/acl/acl_common.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#4 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/common/atomic/i386/atomic.S#4 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/common/atomic/ia64/atomic.S#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/common/avl/avl.c#3 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/common/nvpair/nvpair.c#3 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/common/zfs/zfs_namecheck.c#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/common/zfs/zfs_namecheck.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/common/zfs/zfs_prop.c#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/common/zfs/zfs_prop.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/Makefile.files#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/gfs.c#5 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#6 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/bplist.c#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#4 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu.c#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#3 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/dnode.c#3 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#3 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#3 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#3 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/gzip.c#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/refcount.c#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sha256.c#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#4 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#4 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#3 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/space_map.c#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#3 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#3 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#3 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#3 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#3 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/txg.c#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/unique.c#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#4 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#3 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#6 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#3 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#3 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c#4 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#3 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#3 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#6 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#3 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#3 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#5 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#3 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#4 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#9 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#10 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#7 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#4 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#5 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#5 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/os/callb.c#3 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/os/list.c#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/os/taskq.c#3 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/rpc/xdr.c#3 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/rpc/xdr.h#3 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/rpc/xdr_array.c#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/rpc/xdr_mem.c#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/asm_linkage.h#3 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/avl.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/avl_impl.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/bitmap.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/byteorder.h#3 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/callb.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/ccompile.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/compress.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/cred.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/debug.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/dkio.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/dklabel.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/errorq.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/feature_tests.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/fm/protocol.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/fm/util.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/fs/zfs.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/gfs.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#3 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/list.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/list_impl.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/note.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/nvpair.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/nvpair_impl.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/processor.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/procset.h#3 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/sdt.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/synch.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/sysevent.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#3 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/vmem.h#3 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/zmod.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/zmod/adler32.c#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/zmod/crc32.c#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/zmod/crc32.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/zmod/deflate.c#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/zmod/deflate.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/zmod/inffast.c#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/zmod/inffast.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/zmod/inffixed.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/zmod/inflate.c#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/zmod/inflate.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/zmod/inftrees.c#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/zmod/inftrees.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/zmod/trees.c#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/zmod/zconf.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/zmod/zlib.h#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/zmod/zmod.c#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/zmod/zmod_subr.c#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/zmod/zutil.c#2 delete .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/zmod/zutil.h#2 delete .. //depot/projects/arm/src/sys/contrib/pf/net/pf_if.c#7 integrate .. //depot/projects/arm/src/sys/contrib/pf/net/pf_ioctl.c#12 integrate .. //depot/projects/arm/src/sys/contrib/pf/net/pfvar.h#6 integrate .. //depot/projects/arm/src/sys/dev/aac/aac.c#12 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_adapter.h#10 integrate .. //depot/projects/arm/src/sys/dev/cxgb/sys/cxgb_support.c#2 integrate .. //depot/projects/arm/src/sys/dev/malo/if_malohal.c#2 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt.c#28 integrate .. //depot/projects/arm/src/sys/dev/re/if_re.c#32 integrate .. //depot/projects/arm/src/sys/dev/speaker/spkr.c#4 integrate .. //depot/projects/arm/src/sys/dev/syscons/syscons.c#17 integrate .. //depot/projects/arm/src/sys/dev/usb/ubsa.c#11 integrate .. //depot/projects/arm/src/sys/dev/usb/usbdevs#44 integrate .. //depot/projects/arm/src/sys/fs/coda/coda_vfsops.c#4 integrate .. //depot/projects/arm/src/sys/fs/msdosfs/msdosfs_vfsops.c#25 integrate .. //depot/projects/arm/src/sys/fs/nullfs/null_subr.c#8 integrate .. //depot/projects/arm/src/sys/fs/nullfs/null_vfsops.c#13 integrate .. //depot/projects/arm/src/sys/fs/unionfs/union_vfsops.c#12 integrate .. //depot/projects/arm/src/sys/geom/geom_subr.c#8 integrate .. //depot/projects/arm/src/sys/geom/part/g_part.h#7 integrate .. //depot/projects/arm/src/sys/geom/part/g_part_pc98.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#13 integrate .. //depot/projects/arm/src/sys/i386/conf/GENERIC#29 integrate .. //depot/projects/arm/src/sys/i386/conf/NOTES#29 integrate .. //depot/projects/arm/src/sys/i386/conf/XBOX#9 integrate .. //depot/projects/arm/src/sys/i386/i386/busdma_machdep.c#17 integrate .. //depot/projects/arm/src/sys/i386/i386/pmap.c#38 integrate .. //depot/projects/arm/src/sys/i386/i386/trap.c#20 integrate .. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_util.c#2 integrate .. //depot/projects/arm/src/sys/i386/include/clock.h#10 integrate .. //depot/projects/arm/src/sys/i386/include/param.h#5 integrate .. //depot/projects/arm/src/sys/i386/include/pmap.h#12 integrate .. //depot/projects/arm/src/sys/i386/include/timerreg.h#2 integrate .. //depot/projects/arm/src/sys/i386/isa/clock.c#18 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_sysvec.c#15 integrate .. //depot/projects/arm/src/sys/ia64/conf/GENERIC#17 integrate .. //depot/projects/arm/src/sys/ia64/ia64/elf_machdep.c#7 integrate .. //depot/projects/arm/src/sys/ia64/ia64/machdep.c#22 integrate .. //depot/projects/arm/src/sys/ia64/ia64/pmap.c#18 integrate .. //depot/projects/arm/src/sys/ia64/include/clock.h#3 integrate .. //depot/projects/arm/src/sys/ia64/include/md_var.h#7 integrate .. //depot/projects/arm/src/sys/ia64/include/param.h#5 integrate .. //depot/projects/arm/src/sys/isa/syscons_isa.c#6 integrate .. //depot/projects/arm/src/sys/kern/init_sysent.c#27 integrate .. //depot/projects/arm/src/sys/kern/kern_cpuset.c#4 integrate .. //depot/projects/arm/src/sys/kern/kern_exec.c#25 integrate .. //depot/projects/arm/src/sys/kern/kern_jail.c#12 integrate .. //depot/projects/arm/src/sys/kern/kern_lockf.c#9 integrate .. //depot/projects/arm/src/sys/kern/kern_rwlock.c#15 integrate .. //depot/projects/arm/src/sys/kern/kern_umtx.c#20 integrate .. //depot/projects/arm/src/sys/kern/makesyscalls.sh#9 integrate .. //depot/projects/arm/src/sys/kern/syscalls.c#27 integrate .. //depot/projects/arm/src/sys/kern/syscalls.master#30 integrate .. //depot/projects/arm/src/sys/kern/systrace_args.c#15 integrate .. //depot/projects/arm/src/sys/kern/tty_cons.c#10 integrate .. //depot/projects/arm/src/sys/kern/uipc_mqueue.c#17 integrate .. //depot/projects/arm/src/sys/kern/vfs_acl.c#5 integrate .. //depot/projects/arm/src/sys/kern/vfs_bio.c#28 integrate .. //depot/projects/arm/src/sys/kern/vfs_cache.c#14 integrate .. //depot/projects/arm/src/sys/kern/vfs_extattr.c#4 integrate .. //depot/projects/arm/src/sys/kern/vfs_lookup.c#23 integrate .. //depot/projects/arm/src/sys/kern/vfs_mount.c#37 integrate .. //depot/projects/arm/src/sys/kern/vfs_subr.c#44 integrate .. //depot/projects/arm/src/sys/kern/vfs_syscalls.c#35 integrate .. //depot/projects/arm/src/sys/kern/vfs_vnops.c#20 integrate .. //depot/projects/arm/src/sys/modules/Makefile#54 integrate .. //depot/projects/arm/src/sys/modules/bktr/bktr/Makefile#4 integrate .. //depot/projects/arm/src/sys/modules/em/Makefile#6 integrate .. //depot/projects/arm/src/sys/modules/geom/geom_part/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/geom/geom_part/geom_part_pc98/Makefile#1 branch .. //depot/projects/arm/src/sys/modules/igb/Makefile#2 integrate .. //depot/projects/arm/src/sys/modules/ixgbe/Makefile#2 integrate .. //depot/projects/arm/src/sys/modules/krpc/Makefile#1 branch .. //depot/projects/arm/src/sys/modules/nfslockd/Makefile#1 branch .. //depot/projects/arm/src/sys/modules/sound/driver/emu10kx/Makefile#5 integrate .. //depot/projects/arm/src/sys/modules/uslcom/Makefile#2 integrate .. //depot/projects/arm/src/sys/modules/wpi/Makefile#2 integrate .. //depot/projects/arm/src/sys/modules/zfs/Makefile#7 integrate .. //depot/projects/arm/src/sys/net/bpf_zerocopy.c#2 integrate .. //depot/projects/arm/src/sys/net/if.h#13 integrate .. //depot/projects/arm/src/sys/netgraph/ng_base.c#19 integrate .. //depot/projects/arm/src/sys/netgraph/ng_car.c#5 integrate .. //depot/projects/arm/src/sys/netgraph/ng_pptpgre.c#5 integrate .. //depot/projects/arm/src/sys/netncp/ncp_conn.c#9 integrate .. //depot/projects/arm/src/sys/netsmb/smb_iod.c#6 integrate .. //depot/projects/arm/src/sys/nlm/nlm_prot_clnt.c#2 integrate .. //depot/projects/arm/src/sys/nlm/nlm_prot_impl.c#2 integrate .. //depot/projects/arm/src/sys/nlm/nlm_prot_server.c#2 integrate .. //depot/projects/arm/src/sys/nlm/nlm_prot_svc.c#2 integrate .. //depot/projects/arm/src/sys/nlm/nlm_prot_xdr.c#2 integrate .. //depot/projects/arm/src/sys/nlm/sm_inter_xdr.c#2 integrate .. //depot/projects/arm/src/sys/pc98/cbus/clock.c#10 integrate .. //depot/projects/arm/src/sys/pc98/cbus/syscons_cbus.c#5 integrate .. //depot/projects/arm/src/sys/pc98/conf/GENERIC#18 integrate .. //depot/projects/arm/src/sys/pc98/conf/NOTES#17 integrate .. //depot/projects/arm/src/sys/pc98/include/clock.h#2 integrate .. //depot/projects/arm/src/sys/pc98/include/timerreg.h#2 integrate .. //depot/projects/arm/src/sys/pci/if_rlreg.h#16 integrate .. //depot/projects/arm/src/sys/powerpc/aim/clock.c#2 integrate .. //depot/projects/arm/src/sys/powerpc/booke/clock.c#2 integrate .. //depot/projects/arm/src/sys/powerpc/conf/GENERIC#20 integrate .. //depot/projects/arm/src/sys/powerpc/include/clock.h#4 integrate .. //depot/projects/arm/src/sys/powerpc/include/param.h#3 integrate .. //depot/projects/arm/src/sys/rpc/auth_unix.c#2 integrate .. //depot/projects/arm/src/sys/rpc/authunix_prot.c#2 integrate .. //depot/projects/arm/src/sys/rpc/clnt_dg.c#2 integrate .. //depot/projects/arm/src/sys/rpc/clnt_rc.c#2 integrate .. //depot/projects/arm/src/sys/rpc/clnt_vc.c#2 integrate .. //depot/projects/arm/src/sys/rpc/inet_ntop.c#2 integrate .. //depot/projects/arm/src/sys/rpc/inet_pton.c#2 integrate .. //depot/projects/arm/src/sys/rpc/rpc_generic.c#2 integrate .. //depot/projects/arm/src/sys/rpc/rpcb_clnt.c#2 integrate .. //depot/projects/arm/src/sys/rpc/svc.c#2 integrate .. //depot/projects/arm/src/sys/rpc/svc_auth_unix.c#2 integrate .. //depot/projects/arm/src/sys/rpc/svc_dg.c#2 integrate .. //depot/projects/arm/src/sys/rpc/svc_generic.c#2 integrate .. //depot/projects/arm/src/sys/rpc/svc_vc.c#2 integrate .. //depot/projects/arm/src/sys/security/mac/mac_syscalls.c#6 integrate .. //depot/projects/arm/src/sys/sparc64/conf/GENERIC#27 integrate .. //depot/projects/arm/src/sys/sparc64/include/clock.h#3 integrate .. //depot/projects/arm/src/sys/sparc64/include/param.h#5 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/clock.c#2 integrate .. //depot/projects/arm/src/sys/sun4v/conf/GENERIC#10 integrate .. //depot/projects/arm/src/sys/sun4v/include/clock.h#2 integrate .. //depot/projects/arm/src/sys/sun4v/include/param.h#2 integrate .. //depot/projects/arm/src/sys/sys/aac_ioctl.h#3 integrate .. //depot/projects/arm/src/sys/sys/buf.h#12 integrate .. //depot/projects/arm/src/sys/sys/cpuset.h#4 integrate .. //depot/projects/arm/src/sys/sys/fcntl.h#5 integrate .. //depot/projects/arm/src/sys/sys/imgact.h#5 integrate .. //depot/projects/arm/src/sys/sys/lockmgr.h#11 integrate .. //depot/projects/arm/src/sys/sys/mman.h#4 integrate .. //depot/projects/arm/src/sys/sys/namei.h#4 integrate .. //depot/projects/arm/src/sys/sys/param.h#43 integrate .. //depot/projects/arm/src/sys/sys/rwlock.h#13 integrate .. //depot/projects/arm/src/sys/sys/stat.h#5 integrate .. //depot/projects/arm/src/sys/sys/syscall.h#27 integrate .. //depot/projects/arm/src/sys/sys/syscall.mk#27 integrate .. //depot/projects/arm/src/sys/sys/syscallsubr.h#13 integrate .. //depot/projects/arm/src/sys/sys/sysproto.h#28 integrate .. //depot/projects/arm/src/sys/sys/systm.h#30 integrate .. //depot/projects/arm/src/sys/sys/time.h#8 integrate .. //depot/projects/arm/src/sys/sys/umtx.h#13 integrate .. //depot/projects/arm/src/sys/sys/vnode.h#24 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_snapshot.c#22 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_vfsops.c#31 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_vnops.c#17 integrate .. //depot/projects/arm/src/sys/vm/vm_kern.c#8 integrate .. //depot/projects/arm/src/sys/vm/vm_object.c#28 integrate .. //depot/projects/arm/src/tools/build/mk/OptionalObsoleteFiles.inc#13 integrate .. //depot/projects/arm/src/tools/build/options/WITHOUT_LIBKSE#2 delete .. //depot/projects/arm/src/tools/regression/lib/msun/test-csqrt.c#2 integrate .. //depot/projects/arm/src/tools/regression/lib/msun/test-rem.c#3 integrate .. //depot/projects/arm/src/usr.bin/Makefile#12 integrate .. //depot/projects/arm/src/usr.bin/awk/Makefile#6 integrate .. //depot/projects/arm/src/usr.bin/fstat/zfs/Makefile#2 integrate .. //depot/projects/arm/src/usr.sbin/Makefile#20 integrate .. //depot/projects/arm/src/usr.sbin/amd/amd/Makefile#3 integrate .. //depot/projects/arm/src/usr.sbin/clear_locks/Makefile#2 integrate .. //depot/projects/arm/src/usr.sbin/fifolog/fifolog_reader/Makefile#2 integrate .. //depot/projects/arm/src/usr.sbin/fifolog/fifolog_reader/fifolog_reader.c#2 integrate .. //depot/projects/arm/src/usr.sbin/ngctl/Makefile#7 integrate .. //depot/projects/arm/src/usr.sbin/pkg_install/Makefile#3 integrate .. //depot/projects/arm/src/usr.sbin/pkg_install/add/perform.c#3 integrate .. //depot/projects/arm/src/usr.sbin/pkg_install/sign/Makefile#2 delete .. //depot/projects/arm/src/usr.sbin/pkg_install/sign/README#2 delete .. //depot/projects/arm/src/usr.sbin/pkg_install/sign/check.c#2 delete .. //depot/projects/arm/src/usr.sbin/pkg_install/sign/common.c#2 delete .. //depot/projects/arm/src/usr.sbin/pkg_install/sign/extern.h#3 delete .. //depot/projects/arm/src/usr.sbin/pkg_install/sign/gzip.c#2 delete .. //depot/projects/arm/src/usr.sbin/pkg_install/sign/gzip.h#3 delete .. //depot/projects/arm/src/usr.sbin/pkg_install/sign/main.c#3 delete .. //depot/projects/arm/src/usr.sbin/pkg_install/sign/pgp.h#3 delete .. //depot/projects/arm/src/usr.sbin/pkg_install/sign/pgp_check.c#2 delete .. //depot/projects/arm/src/usr.sbin/pkg_install/sign/pgp_sign.c#2 delete .. //depot/projects/arm/src/usr.sbin/pkg_install/sign/pkg_sign.1#2 delete .. //depot/projects/arm/src/usr.sbin/pkg_install/sign/sha1.c#2 delete .. //depot/projects/arm/src/usr.sbin/pkg_install/sign/sign.c#2 delete .. //depot/projects/arm/src/usr.sbin/pkg_install/sign/stand.c#3 delete .. //depot/projects/arm/src/usr.sbin/pkg_install/sign/stand.h#3 delete .. //depot/projects/arm/src/usr.sbin/pkg_install/sign/x509.c#2 delete .. //depot/projects/arm/src/usr.sbin/rpc.lockd/lockd.c#6 integrate .. //depot/projects/arm/src/usr.sbin/rpc.lockd/rpc.lockd.8#5 integrate Differences ... ==== //depot/projects/arm/src/Makefile#18 (text+ko) ==== @@ -1,6 +1,6 @@ #OSX hint: bsdmake BSDMKAE=bsdmake MACHINE_ARCH=i386 # -# $FreeBSD: src/Makefile,v 1.346 2008/03/25 15:47:22 ru Exp $ +# $FreeBSD: src/Makefile,v 1.347 2008/03/31 13:32:55 pav Exp $ # # The user-driven targets are: # @@ -37,7 +37,7 @@ # The user-driven targets (as listed above) are implemented in Makefile.inc1. # # If you want to build your system from source be sure that /usr/obj has -# at least 400MB of diskspace available. +# at least 800MB of diskspace available. # # For individuals wanting to build from the sources currently on their # system, the simple instructions are: ==== //depot/projects/arm/src/Makefile.inc1#36 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.601 2008/03/02 11:10:46 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.602 2008/03/29 17:44:38 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -1041,18 +1041,14 @@ ${_lib_libgssapi} ${_lib_libipx} \ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Apr 2 07:06:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 22153106566C; Wed, 2 Apr 2008 07:06:46 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D3B5D1065673 for ; Wed, 2 Apr 2008 07:06:45 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C11F48FC23 for ; Wed, 2 Apr 2008 07:06:45 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3276jVt063813 for ; Wed, 2 Apr 2008 07:06:45 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3276jOB063811 for perforce@freebsd.org; Wed, 2 Apr 2008 07:06:45 GMT (envelope-from imp@freebsd.org) Date: Wed, 2 Apr 2008 07:06:45 GMT Message-Id: <200804020706.m3276jOB063811@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 139189 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Apr 2008 07:06:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=139189 Change 139189 by imp@imp_paco-paco on 2008/04/02 07:06:37 IFC @139185 Affected files ... .. //depot/projects/mips2/src/Makefile#9 integrate .. //depot/projects/mips2/src/Makefile.inc1#17 integrate .. //depot/projects/mips2/src/ObsoleteFiles.inc#17 integrate .. //depot/projects/mips2/src/cddl/Makefile.inc#3 integrate .. //depot/projects/mips2/src/cddl/compat/opensolaris/include/alloca.h#1 branch .. //depot/projects/mips2/src/cddl/compat/opensolaris/include/devid.h#1 branch .. //depot/projects/mips2/src/cddl/compat/opensolaris/include/fcntl.h#1 branch .. //depot/projects/mips2/src/cddl/compat/opensolaris/include/fsshare.h#1 branch .. //depot/projects/mips2/src/cddl/compat/opensolaris/include/libintl.h#1 branch .. //depot/projects/mips2/src/cddl/compat/opensolaris/include/mnttab.h#1 branch .. //depot/projects/mips2/src/cddl/compat/opensolaris/include/priv.h#1 branch .. //depot/projects/mips2/src/cddl/compat/opensolaris/include/solaris.h#1 branch .. //depot/projects/mips2/src/cddl/compat/opensolaris/include/stdio.h#1 branch .. //depot/projects/mips2/src/cddl/compat/opensolaris/include/stdlib.h#1 branch .. //depot/projects/mips2/src/cddl/compat/opensolaris/include/strings.h#1 branch .. //depot/projects/mips2/src/cddl/compat/opensolaris/include/unistd.h#1 branch .. //depot/projects/mips2/src/cddl/compat/opensolaris/include/zone.h#1 branch .. //depot/projects/mips2/src/cddl/compat/opensolaris/lib/libumem/umem.c#1 branch .. //depot/projects/mips2/src/cddl/compat/opensolaris/lib/libumem/umem.h#1 branch .. //depot/projects/mips2/src/cddl/compat/opensolaris/misc/deviceid.c#1 branch .. //depot/projects/mips2/src/cddl/compat/opensolaris/misc/fsshare.c#1 branch .. //depot/projects/mips2/src/cddl/compat/opensolaris/misc/mkdirp.c#1 branch .. //depot/projects/mips2/src/cddl/compat/opensolaris/misc/mnttab.c#1 branch .. //depot/projects/mips2/src/cddl/compat/opensolaris/misc/zmount.c#1 branch .. //depot/projects/mips2/src/cddl/compat/opensolaris/misc/zone.c#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/zdb/zdb.8#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/zdb/zdb.c#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/zfs/zfs.8#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/zfs/zfs_util.h#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/zpool/zpool.8#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/zpool/zpool_iter.c#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/zpool/zpool_util.c#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/ztest/ztest.c#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/head/assert.h#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/head/atomic.h#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/head/libintl.h#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/head/stdio_ext.h#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/head/synch.h#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/head/thread.h#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.h#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libnvpair/nvpair_alloc_system.c#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libuutil/common/libuutil.h#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libuutil/common/libuutil_impl.h#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_avl.c#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_ident.c#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_list.c#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_misc.c#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_open.c#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_pname.c#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_strtoint.c#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libzpool/common/util.c#1 branch .. //depot/projects/mips2/src/cddl/lib/Makefile#4 integrate .. //depot/projects/mips2/src/cddl/lib/libavl/Makefile#2 integrate .. //depot/projects/mips2/src/cddl/lib/libnvpair/Makefile#3 integrate .. //depot/projects/mips2/src/cddl/lib/libumem/Makefile#2 integrate .. //depot/projects/mips2/src/cddl/lib/libuutil/Makefile#2 integrate .. //depot/projects/mips2/src/cddl/lib/libzfs/Makefile#3 integrate .. //depot/projects/mips2/src/cddl/lib/libzpool/Makefile#3 integrate .. //depot/projects/mips2/src/cddl/sbin/zfs/Makefile#3 integrate .. //depot/projects/mips2/src/cddl/sbin/zpool/Makefile#3 integrate .. //depot/projects/mips2/src/cddl/usr.bin/Makefile#4 integrate .. //depot/projects/mips2/src/cddl/usr.bin/ztest/Makefile#3 integrate .. //depot/projects/mips2/src/cddl/usr.sbin/Makefile#4 integrate .. //depot/projects/mips2/src/cddl/usr.sbin/zdb/Makefile#3 integrate .. //depot/projects/mips2/src/compat/opensolaris/include/alloca.h#2 delete .. //depot/projects/mips2/src/compat/opensolaris/include/devid.h#3 delete .. //depot/projects/mips2/src/compat/opensolaris/include/fcntl.h#2 delete .. //depot/projects/mips2/src/compat/opensolaris/include/fsshare.h#2 delete .. //depot/projects/mips2/src/compat/opensolaris/include/libintl.h#2 delete .. //depot/projects/mips2/src/compat/opensolaris/include/mnttab.h#2 delete .. //depot/projects/mips2/src/compat/opensolaris/include/priv.h#2 delete .. //depot/projects/mips2/src/compat/opensolaris/include/solaris.h#2 delete .. //depot/projects/mips2/src/compat/opensolaris/include/stdio.h#2 delete .. //depot/projects/mips2/src/compat/opensolaris/include/stdlib.h#2 delete .. //depot/projects/mips2/src/compat/opensolaris/include/strings.h#2 delete .. //depot/projects/mips2/src/compat/opensolaris/include/unistd.h#2 delete .. //depot/projects/mips2/src/compat/opensolaris/include/zone.h#2 delete .. //depot/projects/mips2/src/compat/opensolaris/lib/libumem/umem.c#2 delete .. //depot/projects/mips2/src/compat/opensolaris/lib/libumem/umem.h#2 delete .. //depot/projects/mips2/src/compat/opensolaris/misc/deviceid.c#2 delete .. //depot/projects/mips2/src/compat/opensolaris/misc/fsshare.c#3 delete .. //depot/projects/mips2/src/compat/opensolaris/misc/mkdirp.c#2 delete .. //depot/projects/mips2/src/compat/opensolaris/misc/mnttab.c#2 delete .. //depot/projects/mips2/src/compat/opensolaris/misc/zmount.c#2 delete .. //depot/projects/mips2/src/compat/opensolaris/misc/zone.c#2 delete .. //depot/projects/mips2/src/contrib/netcat/nc.1#3 integrate .. //depot/projects/mips2/src/contrib/netcat/netcat.c#4 integrate .. //depot/projects/mips2/src/contrib/opensolaris/OPENSOLARIS.LICENSE#2 delete .. //depot/projects/mips2/src/contrib/opensolaris/cmd/zdb/zdb.8#2 delete .. //depot/projects/mips2/src/contrib/opensolaris/cmd/zdb/zdb.c#4 delete .. //depot/projects/mips2/src/contrib/opensolaris/cmd/zdb/zdb_il.c#2 delete .. //depot/projects/mips2/src/contrib/opensolaris/cmd/zfs/zfs.8#2 delete .. //depot/projects/mips2/src/contrib/opensolaris/cmd/zfs/zfs_iter.c#2 delete .. //depot/projects/mips2/src/contrib/opensolaris/cmd/zfs/zfs_iter.h#2 delete .. //depot/projects/mips2/src/contrib/opensolaris/cmd/zfs/zfs_main.c#2 delete .. //depot/projects/mips2/src/contrib/opensolaris/cmd/zfs/zfs_util.h#2 delete .. //depot/projects/mips2/src/contrib/opensolaris/cmd/zpool/zpool.8#2 delete .. //depot/projects/mips2/src/contrib/opensolaris/cmd/zpool/zpool_iter.c#2 delete .. //depot/projects/mips2/src/contrib/opensolaris/cmd/zpool/zpool_main.c#2 delete .. //depot/projects/mips2/src/contrib/opensolaris/cmd/zpool/zpool_util.c#2 delete .. //depot/projects/mips2/src/contrib/opensolaris/cmd/zpool/zpool_util.h#2 delete .. //depot/projects/mips2/src/contrib/opensolaris/cmd/zpool/zpool_vdev.c#3 delete .. //depot/projects/mips2/src/contrib/opensolaris/cmd/ztest/ztest.c#2 delete .. //depot/projects/mips2/src/contrib/opensolaris/head/assert.h#2 delete .. //depot/projects/mips2/src/contrib/opensolaris/head/atomic.h#2 delete .. //depot/projects/mips2/src/contrib/opensolaris/head/libintl.h#2 delete .. //depot/projects/mips2/src/contrib/opensolaris/head/stdio_ext.h#2 delete .. //depot/projects/mips2/src/contrib/opensolaris/head/synch.h#2 delete .. //depot/projects/mips2/src/contrib/opensolaris/head/thread.h#2 delete .. //depot/projects/mips2/src/contrib/opensolaris/lib/libnvpair/libnvpair.c#2 delete .. //depot/projects/mips2/src/contrib/opensolaris/lib/libnvpair/libnvpair.h#2 delete .. //depot/projects/mips2/src/contrib/opensolaris/lib/libnvpair/nvpair_alloc_system.c#2 delete .. //depot/projects/mips2/src/contrib/opensolaris/lib/libuutil/common/libuutil.h#2 delete .. //depot/projects/mips2/src/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#2 delete .. //depot/projects/mips2/src/contrib/opensolaris/lib/libuutil/common/libuutil_impl.h#2 delete .. //depot/projects/mips2/src/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#2 delete .. //depot/projects/mips2/src/contrib/opensolaris/lib/libuutil/common/uu_avl.c#2 delete .. //depot/projects/mips2/src/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c#2 delete .. //depot/projects/mips2/src/contrib/opensolaris/lib/libuutil/common/uu_ident.c#2 delete .. //depot/projects/mips2/src/contrib/opensolaris/lib/libuutil/common/uu_list.c#2 delete .. //depot/projects/mips2/src/contrib/opensolaris/lib/libuutil/common/uu_misc.c#2 delete .. //depot/projects/mips2/src/contrib/opensolaris/lib/libuutil/common/uu_open.c#2 delete .. //depot/projects/mips2/src/contrib/opensolaris/lib/libuutil/common/uu_pname.c#2 delete .. //depot/projects/mips2/src/contrib/opensolaris/lib/libuutil/common/uu_strtoint.c#2 delete .. //depot/projects/mips2/src/contrib/opensolaris/lib/libzfs/common/libzfs.h#2 delete .. //depot/projects/mips2/src/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#3 delete .. //depot/projects/mips2/src/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#3 delete .. //depot/projects/mips2/src/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#2 delete .. //depot/projects/mips2/src/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#2 delete .. //depot/projects/mips2/src/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#2 delete .. //depot/projects/mips2/src/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#3 delete .. //depot/projects/mips2/src/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#2 delete .. //depot/projects/mips2/src/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#2 delete .. //depot/projects/mips2/src/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#2 delete .. //depot/projects/mips2/src/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#2 delete .. //depot/projects/mips2/src/contrib/opensolaris/lib/libzpool/common/kernel.c#2 delete .. //depot/projects/mips2/src/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#4 delete .. //depot/projects/mips2/src/contrib/opensolaris/lib/libzpool/common/taskq.c#2 delete .. //depot/projects/mips2/src/contrib/opensolaris/lib/libzpool/common/util.c#2 delete .. //depot/projects/mips2/src/contrib/pf/pfctl/pfctl_altq.c#4 integrate .. //depot/projects/mips2/src/contrib/pf/pfctl/pfctl_qstats.c#2 integrate .. //depot/projects/mips2/src/etc/network.subr#5 integrate .. //depot/projects/mips2/src/etc/newsyslog.conf#2 integrate .. //depot/projects/mips2/src/etc/rc.d/ppp#5 integrate .. //depot/projects/mips2/src/games/fortune/datfiles/fortunes#10 integrate .. //depot/projects/mips2/src/gnu/usr.bin/gdb/kgdb/kld.c#2 integrate .. //depot/projects/mips2/src/gnu/usr.bin/gdb/kgdb/main.c#3 integrate .. //depot/projects/mips2/src/include/complex.h#3 integrate .. //depot/projects/mips2/src/include/stdio.h#3 integrate .. //depot/projects/mips2/src/include/unistd.h#5 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_entry_private.h#3 integrate .. //depot/projects/mips2/src/lib/libc/gen/Makefile.inc#7 integrate .. //depot/projects/mips2/src/lib/libc/gen/modf.3#3 integrate .. //depot/projects/mips2/src/lib/libc/gen/sysctl.3#5 integrate .. //depot/projects/mips2/src/lib/libc/rpc/svc_vc.c#3 integrate .. //depot/projects/mips2/src/lib/libc/stdtime/localtime.c#4 integrate .. //depot/projects/mips2/src/lib/libc/sys/Makefile.inc#8 integrate .. //depot/projects/mips2/src/lib/libc/sys/Symbol.map#9 integrate .. //depot/projects/mips2/src/lib/libc/sys/cpuset.2#1 branch .. //depot/projects/mips2/src/lib/libc/sys/cpuset_getaffinity.2#1 branch .. //depot/projects/mips2/src/lib/libc/sys/mincore.2#3 integrate .. //depot/projects/mips2/src/lib/libc/xdr/xdr_rec.c#2 integrate .. //depot/projects/mips2/src/lib/libthr/Makefile#9 integrate .. //depot/projects/mips2/src/lib/libthr/thread/thr_cond.c#3 integrate .. //depot/projects/mips2/src/lib/libthr/thread/thr_private.h#9 integrate .. //depot/projects/mips2/src/lib/libthr/thread/thr_rwlock.c#2 integrate .. //depot/projects/mips2/src/lib/libthr/thread/thr_umtx.c#5 integrate .. //depot/projects/mips2/src/lib/libthr/thread/thr_umtx.h#4 integrate .. //depot/projects/mips2/src/lib/msun/Makefile#7 integrate .. //depot/projects/mips2/src/lib/msun/Symbol.map#7 integrate .. //depot/projects/mips2/src/lib/msun/amd64/Makefile.inc#5 integrate .. //depot/projects/mips2/src/lib/msun/amd64/e_remainderl.S#1 branch .. //depot/projects/mips2/src/lib/msun/amd64/s_remquol.S#1 branch .. //depot/projects/mips2/src/lib/msun/i387/Makefile.inc#6 integrate .. //depot/projects/mips2/src/lib/msun/i387/e_remainderl.S#1 branch .. //depot/projects/mips2/src/lib/msun/i387/s_remquol.S#1 branch .. //depot/projects/mips2/src/lib/msun/man/csqrt.3#2 integrate .. //depot/projects/mips2/src/lib/msun/man/hypot.3#4 integrate .. //depot/projects/mips2/src/lib/msun/man/remainder.3#3 integrate .. //depot/projects/mips2/src/lib/msun/src/e_hypot.c#3 integrate .. //depot/projects/mips2/src/lib/msun/src/e_hypotf.c#3 integrate .. //depot/projects/mips2/src/lib/msun/src/e_hypotl.c#1 branch .. //depot/projects/mips2/src/lib/msun/src/e_log.c#5 integrate .. //depot/projects/mips2/src/lib/msun/src/e_logf.c#4 integrate .. //depot/projects/mips2/src/lib/msun/src/e_remainder.c#3 integrate .. //depot/projects/mips2/src/lib/msun/src/e_remainderl.c#1 branch .. //depot/projects/mips2/src/lib/msun/src/math.h#6 integrate .. //depot/projects/mips2/src/lib/msun/src/s_csqrt.c#3 integrate .. //depot/projects/mips2/src/lib/msun/src/s_csqrtl.c#1 branch .. //depot/projects/mips2/src/lib/msun/src/s_expm1.c#3 integrate .. //depot/projects/mips2/src/lib/msun/src/s_expm1f.c#3 integrate .. //depot/projects/mips2/src/lib/msun/src/s_fmaf.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/s_log1p.c#3 integrate .. //depot/projects/mips2/src/lib/msun/src/s_log1pf.c#3 integrate .. //depot/projects/mips2/src/lib/msun/src/s_remquo.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/s_remquol.c#1 branch .. //depot/projects/mips2/src/lib/msun/src/w_cabs.c#4 integrate .. //depot/projects/mips2/src/lib/msun/src/w_cabsl.c#1 branch .. //depot/projects/mips2/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#15 integrate .. //depot/projects/mips2/src/rescue/rescue/Makefile#6 integrate .. //depot/projects/mips2/src/sbin/dhclient/dhclient-script#6 integrate .. //depot/projects/mips2/src/sbin/ggate/Makefile#4 integrate .. //depot/projects/mips2/src/sbin/ifconfig/ifclone.c#4 integrate .. //depot/projects/mips2/src/sbin/ifconfig/ifconfig.c#7 integrate .. //depot/projects/mips2/src/sbin/ifconfig/ifconfig.h#5 integrate .. //depot/projects/mips2/src/sbin/ifconfig/ifvlan.c#3 integrate .. //depot/projects/mips2/src/share/man/man3/Makefile#5 integrate .. //depot/projects/mips2/src/share/man/man4/Makefile#16 integrate .. //depot/projects/mips2/src/share/man/man4/arcmsr.4#3 integrate .. //depot/projects/mips2/src/share/man/man4/ng_pptpgre.4#2 integrate .. //depot/projects/mips2/src/share/man/man4/ubsa.4#4 integrate .. //depot/projects/mips2/src/share/man/man5/rc.conf.5#9 integrate .. //depot/projects/mips2/src/share/man/man5/src.conf.5#8 integrate .. //depot/projects/mips2/src/share/man/man8/rc.subr.8#6 integrate .. //depot/projects/mips2/src/share/man/man9/Makefile#12 integrate .. //depot/projects/mips2/src/share/man/man9/lock.9#8 integrate .. //depot/projects/mips2/src/share/man/man9/rwlock.9#6 integrate .. //depot/projects/mips2/src/share/mk/bsd.own.mk#9 integrate .. //depot/projects/mips2/src/sys/amd64/amd64/pmap.c#17 integrate .. //depot/projects/mips2/src/sys/amd64/conf/GENERIC#12 integrate .. //depot/projects/mips2/src/sys/amd64/conf/NOTES#11 integrate .. //depot/projects/mips2/src/sys/amd64/include/clock.h#5 integrate .. //depot/projects/mips2/src/sys/amd64/include/param.h#2 integrate .. //depot/projects/mips2/src/sys/amd64/include/timerreg.h#2 integrate .. //depot/projects/mips2/src/sys/amd64/isa/clock.c#8 integrate .. //depot/projects/mips2/src/sys/arm/conf/AVILA#8 integrate .. //depot/projects/mips2/src/sys/arm/conf/BWCT#3 integrate .. //depot/projects/mips2/src/sys/arm/conf/CRB#4 integrate .. //depot/projects/mips2/src/sys/arm/conf/EP80219#3 integrate .. //depot/projects/mips2/src/sys/arm/conf/HL200#3 integrate .. //depot/projects/mips2/src/sys/arm/conf/IQ31244#4 integrate .. //depot/projects/mips2/src/sys/arm/conf/KB920X#6 integrate .. //depot/projects/mips2/src/sys/arm/conf/SIMICS#4 integrate .. //depot/projects/mips2/src/sys/arm/conf/SKYEYE#4 integrate .. //depot/projects/mips2/src/sys/arm/include/param.h#2 integrate .. //depot/projects/mips2/src/sys/boot/forth/loader.conf#7 integrate .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/kern/opensolaris_kstat.c#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/kern/opensolaris_string.c#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/kern/opensolaris_zone.c#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/machine/endian.h#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/rpc/xdr.h#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/sys/acl.h#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/sys/atomic.h#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/sys/bitmap.h#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/sys/byteorder.h#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/sys/callb.h#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/sys/cmn_err.h#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/sys/cpupart.h#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/sys/cpuvar.h#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/sys/cred.h#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/sys/cyclic.h#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/sys/debug.h#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/sys/dirent.h#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/sys/dkio.h#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/sys/dnlc.h#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/sys/elf.h#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/sys/kcondvar.h#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/sys/kmem.h#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/sys/kobj.h#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/sys/kstat.h#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/sys/lock.h#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/sys/misc.h#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/sys/mman.h#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/sys/mntent.h#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/sys/mnttab.h#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/sys/modctl.h#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/sys/mount.h#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/sys/mutex.h#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/sys/objfs.h#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/sys/param.h#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/sys/pcpu.h#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/sys/policy.h#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/sys/proc.h#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/sys/random.h#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/sys/rwlock.h#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/sys/sdt.h#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/sys/stat.h#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/sys/string.h#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/sys/sunddi.h#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/sys/sysmacros.h#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/sys/systm.h#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/sys/taskq.h#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/sys/taskq_impl.h#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/sys/time.h#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/sys/types.h#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/sys/uio.h#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/sys/varargs.h#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/sys/vfs.h#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/sys/vnode.h#1 branch .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/sys/zone.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/common/atomic/i386/atomic.S#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/common/atomic/ia64/atomic.S#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/common/avl/avl.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/Makefile.files#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bplist.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/gzip.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sha256.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/unique.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/os/callb.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/os/list.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/os/taskq.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_array.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_mem.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/sys/asm_linkage.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/sys/avl_impl.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/sys/bitmap.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/sys/byteorder.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/sys/callb.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/sys/ccompile.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/sys/compress.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/sys/cred.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/sys/dkio.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/sys/dklabel.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/sys/errorq.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/sys/feature_tests.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/sys/fm/protocol.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/sys/fm/util.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/sys/gfs.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/sys/list.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/sys/list_impl.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/sys/note.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair_impl.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/sys/processor.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/sys/procset.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/sys/sdt.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/sys/synch.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/sys/vmem.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/sys/zmod.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/zmod/adler32.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/zmod/deflate.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/zmod/deflate.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inffast.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inffast.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inffixed.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inflate.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inflate.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inftrees.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inftrees.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/zmod/trees.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zconf.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zlib.h#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod_subr.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zutil.c#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zutil.h#1 branch .. //depot/projects/mips2/src/sys/compat/freebsd32/freebsd32_misc.c#8 integrate .. //depot/projects/mips2/src/sys/compat/freebsd32/freebsd32_proto.h#9 integrate .. //depot/projects/mips2/src/sys/compat/freebsd32/freebsd32_syscall.h#9 integrate .. //depot/projects/mips2/src/sys/compat/freebsd32/freebsd32_syscalls.c#9 integrate .. //depot/projects/mips2/src/sys/compat/freebsd32/freebsd32_sysent.c#9 integrate .. //depot/projects/mips2/src/sys/compat/freebsd32/syscalls.master#10 integrate .. //depot/projects/mips2/src/sys/compat/linprocfs/linprocfs.c#9 integrate .. //depot/projects/mips2/src/sys/compat/linux/linux_uid16.c#4 integrate .. //depot/projects/mips2/src/sys/compat/linux/linux_util.c#3 integrate .. //depot/projects/mips2/src/sys/compat/opensolaris/kern/opensolaris_kmem.c#3 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/kern/opensolaris_kobj.c#4 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/kern/opensolaris_kstat.c#3 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/kern/opensolaris_misc.c#3 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/kern/opensolaris_policy.c#3 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/kern/opensolaris_string.c#2 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/kern/opensolaris_vfs.c#6 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/kern/opensolaris_zone.c#2 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/machine/endian.h#2 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/rpc/xdr.h#3 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/acl.h#2 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/atomic.h#4 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/bitmap.h#2 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/byteorder.h#2 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/callb.h#2 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/cmn_err.h#2 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/cpupart.h#2 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/cpuvar.h#2 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/cred.h#2 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/cyclic.h#2 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/debug.h#2 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/dirent.h#2 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/dkio.h#2 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/dnlc.h#2 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/elf.h#2 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/kcondvar.h#3 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/kmem.h#4 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/kobj.h#2 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/kstat.h#2 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/lock.h#2 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/misc.h#3 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/mman.h#2 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/mntent.h#2 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/mnttab.h#2 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/modctl.h#2 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/mount.h#2 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/mutex.h#4 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/objfs.h#2 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/param.h#2 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/pcpu.h#2 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/policy.h#2 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/proc.h#5 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/random.h#2 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/rwlock.h#4 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/sdt.h#2 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/stat.h#2 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/string.h#2 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/sunddi.h#2 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/sysmacros.h#2 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/systm.h#2 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/taskq.h#2 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/taskq_impl.h#2 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/time.h#3 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/types.h#4 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/uio.h#2 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/varargs.h#2 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/vfs.h#3 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/vnode.h#4 delete .. //depot/projects/mips2/src/sys/compat/opensolaris/sys/zone.h#2 delete .. //depot/projects/mips2/src/sys/compat/pecoff/imgact_pecoff.c#5 integrate .. //depot/projects/mips2/src/sys/compat/svr4/svr4_sysvec.c#4 integrate .. //depot/projects/mips2/src/sys/conf/NOTES#18 integrate .. //depot/projects/mips2/src/sys/conf/files#22 integrate .. //depot/projects/mips2/src/sys/conf/options#16 integrate .. //depot/projects/mips2/src/sys/conf/options.amd64#5 integrate .. //depot/projects/mips2/src/sys/conf/options.i386#5 integrate .. //depot/projects/mips2/src/sys/conf/options.pc98#4 integrate .. //depot/projects/mips2/src/sys/contrib/opensolaris/OPENSOLARIS.LICENSE#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/common/acl/acl_common.c#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/common/acl/acl_common.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#3 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/common/atomic/i386/atomic.S#3 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/common/atomic/ia64/atomic.S#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/common/avl/avl.c#3 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/common/nvpair/nvpair.c#3 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/common/zfs/zfs_namecheck.c#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/common/zfs/zfs_namecheck.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/common/zfs/zfs_prop.c#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/common/zfs/zfs_prop.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/Makefile.files#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/gfs.c#4 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#7 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/bplist.c#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#3 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu.c#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#3 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/dnode.c#3 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#3 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#3 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/gzip.c#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/refcount.c#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sha256.c#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#4 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#3 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/space_map.c#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#3 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/txg.c#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/unique.c#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#5 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#3 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#4 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#3 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c#3 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#3 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#3 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#4 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#3 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#3 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#3 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#3 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#4 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#5 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#9 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#5 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#4 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#5 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#4 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/os/callb.c#3 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/os/list.c#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/os/taskq.c#3 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/rpc/xdr.c#3 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/rpc/xdr.h#3 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/rpc/xdr_array.c#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/rpc/xdr_mem.c#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/asm_linkage.h#3 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/avl.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/avl_impl.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/bitmap.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/byteorder.h#3 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/callb.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/ccompile.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/compress.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/cred.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/debug.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/dkio.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/dklabel.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/errorq.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/feature_tests.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/fm/protocol.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/fm/util.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/fs/zfs.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/gfs.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#3 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/list.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/list_impl.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/note.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/nvpair.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/nvpair_impl.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/processor.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/procset.h#3 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/sdt.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/synch.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/sysevent.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#3 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/vmem.h#3 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/zmod.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/zmod/adler32.c#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/zmod/crc32.c#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/zmod/crc32.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/zmod/deflate.c#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/zmod/deflate.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/zmod/inffast.c#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/zmod/inffast.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/zmod/inffixed.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/zmod/inflate.c#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/zmod/inflate.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/zmod/inftrees.c#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/zmod/inftrees.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/zmod/trees.c#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/zmod/zconf.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/zmod/zlib.h#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/zmod/zmod.c#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/zmod/zmod_subr.c#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/zmod/zutil.c#2 delete .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/zmod/zutil.h#2 delete .. //depot/projects/mips2/src/sys/contrib/pf/net/pf_if.c#5 integrate .. //depot/projects/mips2/src/sys/contrib/pf/net/pf_ioctl.c#7 integrate .. //depot/projects/mips2/src/sys/contrib/pf/net/pfvar.h#3 integrate .. //depot/projects/mips2/src/sys/dev/aac/aac.c#8 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/cxgb_adapter.h#10 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/sys/cxgb_support.c#3 integrate .. //depot/projects/mips2/src/sys/dev/malo/if_malohal.c#2 integrate .. //depot/projects/mips2/src/sys/dev/mpt/mpt.c#7 integrate .. //depot/projects/mips2/src/sys/dev/re/if_re.c#14 integrate .. //depot/projects/mips2/src/sys/dev/speaker/spkr.c#4 integrate .. //depot/projects/mips2/src/sys/dev/syscons/syscons.c#8 integrate .. //depot/projects/mips2/src/sys/dev/usb/ubsa.c#5 integrate .. //depot/projects/mips2/src/sys/dev/usb/usbdevs#15 integrate .. //depot/projects/mips2/src/sys/fs/coda/coda_vfsops.c#4 integrate .. //depot/projects/mips2/src/sys/fs/msdosfs/msdosfs_vfsops.c#11 integrate .. //depot/projects/mips2/src/sys/fs/nullfs/null_subr.c#5 integrate .. //depot/projects/mips2/src/sys/fs/nullfs/null_vfsops.c#7 integrate .. //depot/projects/mips2/src/sys/fs/unionfs/union_vfsops.c#6 integrate .. //depot/projects/mips2/src/sys/geom/geom_subr.c#5 integrate .. //depot/projects/mips2/src/sys/geom/part/g_part.h#6 integrate .. //depot/projects/mips2/src/sys/geom/part/g_part_pc98.c#1 branch .. //depot/projects/mips2/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#7 integrate .. //depot/projects/mips2/src/sys/i386/conf/GENERIC#12 integrate .. //depot/projects/mips2/src/sys/i386/conf/NOTES#11 integrate .. //depot/projects/mips2/src/sys/i386/conf/XBOX#4 integrate .. //depot/projects/mips2/src/sys/i386/i386/busdma_machdep.c#7 integrate .. //depot/projects/mips2/src/sys/i386/i386/pmap.c#15 integrate .. //depot/projects/mips2/src/sys/i386/i386/trap.c#11 integrate .. //depot/projects/mips2/src/sys/i386/ibcs2/ibcs2_util.c#2 integrate .. //depot/projects/mips2/src/sys/i386/include/clock.h#5 integrate .. //depot/projects/mips2/src/sys/i386/include/param.h#2 integrate .. //depot/projects/mips2/src/sys/i386/include/pmap.h#6 integrate .. //depot/projects/mips2/src/sys/i386/include/timerreg.h#2 integrate .. //depot/projects/mips2/src/sys/i386/isa/clock.c#9 integrate .. //depot/projects/mips2/src/sys/i386/linux/linux_sysvec.c#6 integrate .. //depot/projects/mips2/src/sys/ia64/conf/GENERIC#9 integrate .. //depot/projects/mips2/src/sys/ia64/ia64/elf_machdep.c#3 integrate .. //depot/projects/mips2/src/sys/ia64/ia64/machdep.c#11 integrate .. //depot/projects/mips2/src/sys/ia64/ia64/pmap.c#8 integrate .. //depot/projects/mips2/src/sys/ia64/include/clock.h#3 integrate .. //depot/projects/mips2/src/sys/ia64/include/md_var.h#4 integrate .. //depot/projects/mips2/src/sys/ia64/include/param.h#2 integrate .. //depot/projects/mips2/src/sys/isa/syscons_isa.c#4 integrate .. //depot/projects/mips2/src/sys/kern/init_sysent.c#11 integrate .. //depot/projects/mips2/src/sys/kern/kern_cpuset.c#4 integrate .. //depot/projects/mips2/src/sys/kern/kern_exec.c#9 integrate .. //depot/projects/mips2/src/sys/kern/kern_jail.c#6 integrate .. //depot/projects/mips2/src/sys/kern/kern_lockf.c#6 integrate .. //depot/projects/mips2/src/sys/kern/kern_rwlock.c#9 integrate .. //depot/projects/mips2/src/sys/kern/kern_umtx.c#6 integrate .. //depot/projects/mips2/src/sys/kern/makesyscalls.sh#5 integrate .. //depot/projects/mips2/src/sys/kern/syscalls.c#11 integrate .. //depot/projects/mips2/src/sys/kern/syscalls.master#12 integrate .. //depot/projects/mips2/src/sys/kern/systrace_args.c#8 integrate .. //depot/projects/mips2/src/sys/kern/tty_cons.c#7 integrate .. //depot/projects/mips2/src/sys/kern/uipc_mqueue.c#6 integrate .. //depot/projects/mips2/src/sys/kern/vfs_acl.c#5 integrate .. //depot/projects/mips2/src/sys/kern/vfs_bio.c#15 integrate .. //depot/projects/mips2/src/sys/kern/vfs_cache.c#10 integrate .. //depot/projects/mips2/src/sys/kern/vfs_extattr.c#4 integrate .. //depot/projects/mips2/src/sys/kern/vfs_lookup.c#9 integrate .. //depot/projects/mips2/src/sys/kern/vfs_mount.c#12 integrate .. //depot/projects/mips2/src/sys/kern/vfs_subr.c#16 integrate .. //depot/projects/mips2/src/sys/kern/vfs_syscalls.c#8 integrate .. //depot/projects/mips2/src/sys/kern/vfs_vnops.c#8 integrate .. //depot/projects/mips2/src/sys/modules/Makefile#13 integrate .. //depot/projects/mips2/src/sys/modules/bktr/bktr/Makefile#2 integrate .. //depot/projects/mips2/src/sys/modules/em/Makefile#4 integrate .. //depot/projects/mips2/src/sys/modules/geom/geom_part/Makefile#3 integrate .. //depot/projects/mips2/src/sys/modules/geom/geom_part/geom_part_pc98/Makefile#1 branch .. //depot/projects/mips2/src/sys/modules/igb/Makefile#2 integrate .. //depot/projects/mips2/src/sys/modules/ixgbe/Makefile#2 integrate .. //depot/projects/mips2/src/sys/modules/krpc/Makefile#1 branch .. //depot/projects/mips2/src/sys/modules/nfslockd/Makefile#1 branch .. //depot/projects/mips2/src/sys/modules/sound/driver/emu10kx/Makefile#5 integrate .. //depot/projects/mips2/src/sys/modules/uslcom/Makefile#2 integrate .. //depot/projects/mips2/src/sys/modules/wpi/Makefile#3 integrate .. //depot/projects/mips2/src/sys/modules/zfs/Makefile#6 integrate .. //depot/projects/mips2/src/sys/net/bpf_zerocopy.c#2 integrate .. //depot/projects/mips2/src/sys/net/if.h#5 integrate .. //depot/projects/mips2/src/sys/netgraph/ng_base.c#13 integrate .. //depot/projects/mips2/src/sys/netgraph/ng_car.c#3 integrate .. //depot/projects/mips2/src/sys/netgraph/ng_pptpgre.c#4 integrate .. //depot/projects/mips2/src/sys/netncp/ncp_conn.c#6 integrate .. //depot/projects/mips2/src/sys/netsmb/smb_iod.c#6 integrate .. //depot/projects/mips2/src/sys/nlm/nlm_prot_clnt.c#2 integrate .. //depot/projects/mips2/src/sys/nlm/nlm_prot_impl.c#2 integrate .. //depot/projects/mips2/src/sys/nlm/nlm_prot_server.c#2 integrate .. //depot/projects/mips2/src/sys/nlm/nlm_prot_svc.c#2 integrate .. //depot/projects/mips2/src/sys/nlm/nlm_prot_xdr.c#2 integrate .. //depot/projects/mips2/src/sys/nlm/sm_inter_xdr.c#2 integrate .. //depot/projects/mips2/src/sys/pc98/cbus/clock.c#7 integrate .. //depot/projects/mips2/src/sys/pc98/cbus/syscons_cbus.c#4 integrate .. //depot/projects/mips2/src/sys/pc98/conf/GENERIC#10 integrate .. //depot/projects/mips2/src/sys/pc98/conf/NOTES#5 integrate .. //depot/projects/mips2/src/sys/pc98/include/clock.h#2 integrate .. //depot/projects/mips2/src/sys/pc98/include/timerreg.h#2 integrate .. //depot/projects/mips2/src/sys/pci/if_rlreg.h#11 integrate .. //depot/projects/mips2/src/sys/powerpc/aim/clock.c#2 integrate .. //depot/projects/mips2/src/sys/powerpc/booke/clock.c#2 integrate .. //depot/projects/mips2/src/sys/powerpc/conf/GENERIC#10 integrate .. //depot/projects/mips2/src/sys/powerpc/include/clock.h#3 integrate .. //depot/projects/mips2/src/sys/powerpc/include/param.h#2 integrate .. //depot/projects/mips2/src/sys/rpc/auth_unix.c#2 integrate .. //depot/projects/mips2/src/sys/rpc/authunix_prot.c#2 integrate .. //depot/projects/mips2/src/sys/rpc/clnt_dg.c#2 integrate .. //depot/projects/mips2/src/sys/rpc/clnt_rc.c#2 integrate .. //depot/projects/mips2/src/sys/rpc/clnt_vc.c#2 integrate .. //depot/projects/mips2/src/sys/rpc/inet_ntop.c#2 integrate .. //depot/projects/mips2/src/sys/rpc/inet_pton.c#2 integrate .. //depot/projects/mips2/src/sys/rpc/rpc_generic.c#2 integrate .. //depot/projects/mips2/src/sys/rpc/rpcb_clnt.c#2 integrate .. //depot/projects/mips2/src/sys/rpc/svc.c#2 integrate .. //depot/projects/mips2/src/sys/rpc/svc_auth_unix.c#2 integrate .. //depot/projects/mips2/src/sys/rpc/svc_dg.c#2 integrate .. //depot/projects/mips2/src/sys/rpc/svc_generic.c#2 integrate .. //depot/projects/mips2/src/sys/rpc/svc_vc.c#2 integrate .. //depot/projects/mips2/src/sys/security/mac/mac_syscalls.c#5 integrate .. //depot/projects/mips2/src/sys/sparc64/conf/GENERIC#10 integrate .. //depot/projects/mips2/src/sys/sparc64/include/clock.h#3 integrate .. //depot/projects/mips2/src/sys/sparc64/include/param.h#3 integrate .. //depot/projects/mips2/src/sys/sparc64/sparc64/clock.c#2 integrate .. //depot/projects/mips2/src/sys/sun4v/conf/GENERIC#6 integrate .. //depot/projects/mips2/src/sys/sun4v/include/clock.h#2 integrate .. //depot/projects/mips2/src/sys/sun4v/include/param.h#2 integrate .. //depot/projects/mips2/src/sys/sys/aac_ioctl.h#3 integrate .. //depot/projects/mips2/src/sys/sys/buf.h#7 integrate .. //depot/projects/mips2/src/sys/sys/cpuset.h#4 integrate .. //depot/projects/mips2/src/sys/sys/fcntl.h#5 integrate .. //depot/projects/mips2/src/sys/sys/imgact.h#3 integrate .. //depot/projects/mips2/src/sys/sys/lockmgr.h#8 integrate .. //depot/projects/mips2/src/sys/sys/mman.h#3 integrate .. //depot/projects/mips2/src/sys/sys/namei.h#2 integrate .. //depot/projects/mips2/src/sys/sys/param.h#15 integrate .. //depot/projects/mips2/src/sys/sys/rwlock.h#6 integrate .. //depot/projects/mips2/src/sys/sys/stat.h#4 integrate .. //depot/projects/mips2/src/sys/sys/syscall.h#11 integrate .. //depot/projects/mips2/src/sys/sys/syscall.mk#11 integrate .. //depot/projects/mips2/src/sys/sys/syscallsubr.h#6 integrate .. //depot/projects/mips2/src/sys/sys/sysproto.h#11 integrate .. //depot/projects/mips2/src/sys/sys/systm.h#10 integrate .. //depot/projects/mips2/src/sys/sys/time.h#5 integrate .. //depot/projects/mips2/src/sys/sys/umtx.h#5 integrate .. //depot/projects/mips2/src/sys/sys/vnode.h#8 integrate .. //depot/projects/mips2/src/sys/ufs/ffs/ffs_snapshot.c#8 integrate .. //depot/projects/mips2/src/sys/ufs/ffs/ffs_vfsops.c#9 integrate .. //depot/projects/mips2/src/sys/ufs/ffs/ffs_vnops.c#9 integrate .. //depot/projects/mips2/src/sys/vm/vm_kern.c#6 integrate .. //depot/projects/mips2/src/sys/vm/vm_object.c#9 integrate .. //depot/projects/mips2/src/tools/build/mk/OptionalObsoleteFiles.inc#8 integrate .. //depot/projects/mips2/src/tools/build/options/WITHOUT_LIBKSE#2 delete .. //depot/projects/mips2/src/tools/regression/lib/msun/test-csqrt.c#2 integrate .. //depot/projects/mips2/src/tools/regression/lib/msun/test-rem.c#3 integrate .. //depot/projects/mips2/src/usr.bin/Makefile#11 integrate .. //depot/projects/mips2/src/usr.bin/awk/Makefile#5 integrate .. //depot/projects/mips2/src/usr.bin/fstat/zfs/Makefile#5 integrate .. //depot/projects/mips2/src/usr.sbin/Makefile#12 integrate .. //depot/projects/mips2/src/usr.sbin/amd/amd/Makefile#3 integrate .. //depot/projects/mips2/src/usr.sbin/clear_locks/Makefile#2 integrate .. //depot/projects/mips2/src/usr.sbin/fifolog/fifolog_reader/Makefile#2 integrate .. //depot/projects/mips2/src/usr.sbin/fifolog/fifolog_reader/fifolog_reader.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/ngctl/Makefile#4 integrate .. //depot/projects/mips2/src/usr.sbin/pkg_install/Makefile#4 integrate .. //depot/projects/mips2/src/usr.sbin/pkg_install/add/perform.c#3 integrate .. //depot/projects/mips2/src/usr.sbin/pkg_install/sign/Makefile#2 delete .. //depot/projects/mips2/src/usr.sbin/pkg_install/sign/README#2 delete .. //depot/projects/mips2/src/usr.sbin/pkg_install/sign/check.c#2 delete .. //depot/projects/mips2/src/usr.sbin/pkg_install/sign/common.c#2 delete .. //depot/projects/mips2/src/usr.sbin/pkg_install/sign/extern.h#3 delete .. //depot/projects/mips2/src/usr.sbin/pkg_install/sign/gzip.c#2 delete .. //depot/projects/mips2/src/usr.sbin/pkg_install/sign/gzip.h#3 delete .. //depot/projects/mips2/src/usr.sbin/pkg_install/sign/main.c#3 delete .. //depot/projects/mips2/src/usr.sbin/pkg_install/sign/pgp.h#3 delete .. //depot/projects/mips2/src/usr.sbin/pkg_install/sign/pgp_check.c#2 delete .. //depot/projects/mips2/src/usr.sbin/pkg_install/sign/pgp_sign.c#2 delete .. //depot/projects/mips2/src/usr.sbin/pkg_install/sign/pkg_sign.1#2 delete .. //depot/projects/mips2/src/usr.sbin/pkg_install/sign/sha1.c#2 delete .. //depot/projects/mips2/src/usr.sbin/pkg_install/sign/sign.c#2 delete .. //depot/projects/mips2/src/usr.sbin/pkg_install/sign/stand.c#3 delete .. //depot/projects/mips2/src/usr.sbin/pkg_install/sign/stand.h#3 delete .. //depot/projects/mips2/src/usr.sbin/pkg_install/sign/x509.c#2 delete .. //depot/projects/mips2/src/usr.sbin/rpc.lockd/lockd.c#7 integrate .. //depot/projects/mips2/src/usr.sbin/rpc.lockd/rpc.lockd.8#5 integrate Differences ... ==== //depot/projects/mips2/src/Makefile#9 (text+ko) ==== @@ -1,6 +1,6 @@ #OSX hint: bsdmake BSDMKAE=bsdmake MACHINE_ARCH=i386 # -# $FreeBSD: src/Makefile,v 1.346 2008/03/25 15:47:22 ru Exp $ +# $FreeBSD: src/Makefile,v 1.347 2008/03/31 13:32:55 pav Exp $ # # The user-driven targets are: # @@ -37,7 +37,7 @@ # The user-driven targets (as listed above) are implemented in Makefile.inc1. # # If you want to build your system from source be sure that /usr/obj has -# at least 400MB of diskspace available. +# at least 800MB of diskspace available. # # For individuals wanting to build from the sources currently on their # system, the simple instructions are: ==== //depot/projects/mips2/src/Makefile.inc1#17 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.601 2008/03/02 11:10:46 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.602 2008/03/29 17:44:38 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -1015,18 +1015,14 @@ ${_lib_libgssapi} ${_lib_libipx} \ lib/libkiconv lib/libkvm lib/libmd \ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Apr 2 07:16:58 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E3CD21065682; Wed, 2 Apr 2008 07:16:57 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8734D106567A for ; Wed, 2 Apr 2008 07:16:57 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 731D78FC47 for ; Wed, 2 Apr 2008 07:16:57 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m327Gvf5064094 for ; Wed, 2 Apr 2008 07:16:57 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m327Gu12064092 for perforce@freebsd.org; Wed, 2 Apr 2008 07:16:56 GMT (envelope-from imp@freebsd.org) Date: Wed, 2 Apr 2008 07:16:56 GMT Message-Id: <200804020716.m327Gu12064092@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 139191 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Apr 2008 07:16:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=139191 Change 139191 by imp@imp_paco-paco on 2008/04/02 07:16:12 IFC @139190 Affected files ... .. //depot/projects/mips2-jnpr/src/Makefile#7 integrate .. //depot/projects/mips2-jnpr/src/Makefile.inc1#9 integrate .. //depot/projects/mips2-jnpr/src/ObsoleteFiles.inc#6 integrate .. //depot/projects/mips2-jnpr/src/cddl/Makefile.inc#2 integrate .. //depot/projects/mips2-jnpr/src/cddl/compat/opensolaris/include/alloca.h#1 branch .. //depot/projects/mips2-jnpr/src/cddl/compat/opensolaris/include/devid.h#1 branch .. //depot/projects/mips2-jnpr/src/cddl/compat/opensolaris/include/fcntl.h#1 branch .. //depot/projects/mips2-jnpr/src/cddl/compat/opensolaris/include/fsshare.h#1 branch .. //depot/projects/mips2-jnpr/src/cddl/compat/opensolaris/include/libintl.h#1 branch .. //depot/projects/mips2-jnpr/src/cddl/compat/opensolaris/include/mnttab.h#1 branch .. //depot/projects/mips2-jnpr/src/cddl/compat/opensolaris/include/priv.h#1 branch .. //depot/projects/mips2-jnpr/src/cddl/compat/opensolaris/include/solaris.h#1 branch .. //depot/projects/mips2-jnpr/src/cddl/compat/opensolaris/include/stdio.h#1 branch .. //depot/projects/mips2-jnpr/src/cddl/compat/opensolaris/include/stdlib.h#1 branch .. //depot/projects/mips2-jnpr/src/cddl/compat/opensolaris/include/strings.h#1 branch .. //depot/projects/mips2-jnpr/src/cddl/compat/opensolaris/include/unistd.h#1 branch .. //depot/projects/mips2-jnpr/src/cddl/compat/opensolaris/include/zone.h#1 branch .. //depot/projects/mips2-jnpr/src/cddl/compat/opensolaris/lib/libumem/umem.c#1 branch .. //depot/projects/mips2-jnpr/src/cddl/compat/opensolaris/lib/libumem/umem.h#1 branch .. //depot/projects/mips2-jnpr/src/cddl/compat/opensolaris/misc/deviceid.c#1 branch .. //depot/projects/mips2-jnpr/src/cddl/compat/opensolaris/misc/fsshare.c#1 branch .. //depot/projects/mips2-jnpr/src/cddl/compat/opensolaris/misc/mkdirp.c#1 branch .. //depot/projects/mips2-jnpr/src/cddl/compat/opensolaris/misc/mnttab.c#1 branch .. //depot/projects/mips2-jnpr/src/cddl/compat/opensolaris/misc/zmount.c#1 branch .. //depot/projects/mips2-jnpr/src/cddl/compat/opensolaris/misc/zone.c#1 branch .. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/zdb/zdb.8#1 branch .. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/zdb/zdb.c#1 branch .. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c#1 branch .. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/zfs/zfs.8#1 branch .. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c#1 branch .. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h#1 branch .. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c#1 branch .. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/zfs/zfs_util.h#1 branch .. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/zpool/zpool.8#1 branch .. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/zpool/zpool_iter.c#1 branch .. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c#1 branch .. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/zpool/zpool_util.c#1 branch .. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h#1 branch .. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c#1 branch .. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/ztest/ztest.c#1 branch .. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/head/assert.h#1 branch .. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/head/atomic.h#1 branch .. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/head/libintl.h#1 branch .. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/head/stdio_ext.h#1 branch .. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/head/synch.h#1 branch .. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/head/thread.h#1 branch .. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c#1 branch .. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.h#1 branch .. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/lib/libnvpair/nvpair_alloc_system.c#1 branch .. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/lib/libuutil/common/libuutil.h#1 branch .. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#1 branch .. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/lib/libuutil/common/libuutil_impl.h#1 branch .. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#1 branch .. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_avl.c#1 branch .. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c#1 branch .. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_ident.c#1 branch .. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_list.c#1 branch .. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_misc.c#1 branch .. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_open.c#1 branch .. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_pname.c#1 branch .. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_strtoint.c#1 branch .. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h#1 branch .. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#1 branch .. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#1 branch .. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#1 branch .. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#1 branch .. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#1 branch .. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#1 branch .. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#1 branch .. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#1 branch .. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#1 branch .. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#1 branch .. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c#1 branch .. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#1 branch .. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c#1 branch .. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/lib/libzpool/common/util.c#1 branch .. //depot/projects/mips2-jnpr/src/cddl/lib/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/cddl/lib/libavl/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/cddl/lib/libnvpair/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/cddl/lib/libumem/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/cddl/lib/libuutil/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/cddl/lib/libzfs/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/cddl/lib/libzpool/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/cddl/sbin/zfs/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/cddl/sbin/zpool/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/cddl/usr.bin/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/cddl/usr.bin/ztest/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/cddl/usr.sbin/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/cddl/usr.sbin/zdb/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/compat/opensolaris/include/alloca.h#2 delete .. //depot/projects/mips2-jnpr/src/compat/opensolaris/include/devid.h#2 delete .. //depot/projects/mips2-jnpr/src/compat/opensolaris/include/fcntl.h#2 delete .. //depot/projects/mips2-jnpr/src/compat/opensolaris/include/fsshare.h#2 delete .. //depot/projects/mips2-jnpr/src/compat/opensolaris/include/libintl.h#2 delete .. //depot/projects/mips2-jnpr/src/compat/opensolaris/include/mnttab.h#2 delete .. //depot/projects/mips2-jnpr/src/compat/opensolaris/include/priv.h#2 delete .. //depot/projects/mips2-jnpr/src/compat/opensolaris/include/solaris.h#2 delete .. //depot/projects/mips2-jnpr/src/compat/opensolaris/include/stdio.h#2 delete .. //depot/projects/mips2-jnpr/src/compat/opensolaris/include/stdlib.h#2 delete .. //depot/projects/mips2-jnpr/src/compat/opensolaris/include/strings.h#2 delete .. //depot/projects/mips2-jnpr/src/compat/opensolaris/include/unistd.h#2 delete .. //depot/projects/mips2-jnpr/src/compat/opensolaris/include/zone.h#2 delete .. //depot/projects/mips2-jnpr/src/compat/opensolaris/lib/libumem/umem.c#2 delete .. //depot/projects/mips2-jnpr/src/compat/opensolaris/lib/libumem/umem.h#2 delete .. //depot/projects/mips2-jnpr/src/compat/opensolaris/misc/deviceid.c#2 delete .. //depot/projects/mips2-jnpr/src/compat/opensolaris/misc/fsshare.c#2 delete .. //depot/projects/mips2-jnpr/src/compat/opensolaris/misc/mkdirp.c#2 delete .. //depot/projects/mips2-jnpr/src/compat/opensolaris/misc/mnttab.c#2 delete .. //depot/projects/mips2-jnpr/src/compat/opensolaris/misc/zmount.c#2 delete .. //depot/projects/mips2-jnpr/src/compat/opensolaris/misc/zone.c#2 delete .. //depot/projects/mips2-jnpr/src/contrib/netcat/nc.1#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/netcat/netcat.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/opensolaris/OPENSOLARIS.LICENSE#2 delete .. //depot/projects/mips2-jnpr/src/contrib/opensolaris/cmd/zdb/zdb.8#2 delete .. //depot/projects/mips2-jnpr/src/contrib/opensolaris/cmd/zdb/zdb.c#2 delete .. //depot/projects/mips2-jnpr/src/contrib/opensolaris/cmd/zdb/zdb_il.c#2 delete .. //depot/projects/mips2-jnpr/src/contrib/opensolaris/cmd/zfs/zfs.8#2 delete .. //depot/projects/mips2-jnpr/src/contrib/opensolaris/cmd/zfs/zfs_iter.c#2 delete .. //depot/projects/mips2-jnpr/src/contrib/opensolaris/cmd/zfs/zfs_iter.h#2 delete .. //depot/projects/mips2-jnpr/src/contrib/opensolaris/cmd/zfs/zfs_main.c#2 delete .. //depot/projects/mips2-jnpr/src/contrib/opensolaris/cmd/zfs/zfs_util.h#2 delete .. //depot/projects/mips2-jnpr/src/contrib/opensolaris/cmd/zpool/zpool.8#2 delete .. //depot/projects/mips2-jnpr/src/contrib/opensolaris/cmd/zpool/zpool_iter.c#2 delete .. //depot/projects/mips2-jnpr/src/contrib/opensolaris/cmd/zpool/zpool_main.c#2 delete .. //depot/projects/mips2-jnpr/src/contrib/opensolaris/cmd/zpool/zpool_util.c#2 delete .. //depot/projects/mips2-jnpr/src/contrib/opensolaris/cmd/zpool/zpool_util.h#2 delete .. //depot/projects/mips2-jnpr/src/contrib/opensolaris/cmd/zpool/zpool_vdev.c#2 delete .. //depot/projects/mips2-jnpr/src/contrib/opensolaris/cmd/ztest/ztest.c#2 delete .. //depot/projects/mips2-jnpr/src/contrib/opensolaris/head/assert.h#2 delete .. //depot/projects/mips2-jnpr/src/contrib/opensolaris/head/atomic.h#2 delete .. //depot/projects/mips2-jnpr/src/contrib/opensolaris/head/libintl.h#2 delete .. //depot/projects/mips2-jnpr/src/contrib/opensolaris/head/stdio_ext.h#2 delete .. //depot/projects/mips2-jnpr/src/contrib/opensolaris/head/synch.h#2 delete .. //depot/projects/mips2-jnpr/src/contrib/opensolaris/head/thread.h#2 delete .. //depot/projects/mips2-jnpr/src/contrib/opensolaris/lib/libnvpair/libnvpair.c#2 delete .. //depot/projects/mips2-jnpr/src/contrib/opensolaris/lib/libnvpair/libnvpair.h#2 delete .. //depot/projects/mips2-jnpr/src/contrib/opensolaris/lib/libnvpair/nvpair_alloc_system.c#2 delete .. //depot/projects/mips2-jnpr/src/contrib/opensolaris/lib/libuutil/common/libuutil.h#2 delete .. //depot/projects/mips2-jnpr/src/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#2 delete .. //depot/projects/mips2-jnpr/src/contrib/opensolaris/lib/libuutil/common/libuutil_impl.h#2 delete .. //depot/projects/mips2-jnpr/src/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#2 delete .. //depot/projects/mips2-jnpr/src/contrib/opensolaris/lib/libuutil/common/uu_avl.c#2 delete .. //depot/projects/mips2-jnpr/src/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c#2 delete .. //depot/projects/mips2-jnpr/src/contrib/opensolaris/lib/libuutil/common/uu_ident.c#2 delete .. //depot/projects/mips2-jnpr/src/contrib/opensolaris/lib/libuutil/common/uu_list.c#2 delete .. //depot/projects/mips2-jnpr/src/contrib/opensolaris/lib/libuutil/common/uu_misc.c#2 delete .. //depot/projects/mips2-jnpr/src/contrib/opensolaris/lib/libuutil/common/uu_open.c#2 delete .. //depot/projects/mips2-jnpr/src/contrib/opensolaris/lib/libuutil/common/uu_pname.c#2 delete .. //depot/projects/mips2-jnpr/src/contrib/opensolaris/lib/libuutil/common/uu_strtoint.c#2 delete .. //depot/projects/mips2-jnpr/src/contrib/opensolaris/lib/libzfs/common/libzfs.h#2 delete .. //depot/projects/mips2-jnpr/src/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#2 delete .. //depot/projects/mips2-jnpr/src/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#2 delete .. //depot/projects/mips2-jnpr/src/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#2 delete .. //depot/projects/mips2-jnpr/src/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#2 delete .. //depot/projects/mips2-jnpr/src/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#2 delete .. //depot/projects/mips2-jnpr/src/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#2 delete .. //depot/projects/mips2-jnpr/src/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#2 delete .. //depot/projects/mips2-jnpr/src/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#2 delete .. //depot/projects/mips2-jnpr/src/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#2 delete .. //depot/projects/mips2-jnpr/src/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#2 delete .. //depot/projects/mips2-jnpr/src/contrib/opensolaris/lib/libzpool/common/kernel.c#2 delete .. //depot/projects/mips2-jnpr/src/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#2 delete .. //depot/projects/mips2-jnpr/src/contrib/opensolaris/lib/libzpool/common/taskq.c#2 delete .. //depot/projects/mips2-jnpr/src/contrib/opensolaris/lib/libzpool/common/util.c#2 delete .. //depot/projects/mips2-jnpr/src/contrib/pf/pfctl/pfctl_altq.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/pf/pfctl/pfctl_qstats.c#2 integrate .. //depot/projects/mips2-jnpr/src/etc/network.subr#2 integrate .. //depot/projects/mips2-jnpr/src/etc/newsyslog.conf#2 integrate .. //depot/projects/mips2-jnpr/src/etc/rc.d/ppp#3 integrate .. //depot/projects/mips2-jnpr/src/games/fortune/datfiles/fortunes#4 integrate .. //depot/projects/mips2-jnpr/src/gnu/usr.bin/gdb/kgdb/kld.c#2 integrate .. //depot/projects/mips2-jnpr/src/gnu/usr.bin/gdb/kgdb/main.c#3 integrate .. //depot/projects/mips2-jnpr/src/include/complex.h#2 integrate .. //depot/projects/mips2-jnpr/src/include/stdio.h#2 integrate .. //depot/projects/mips2-jnpr/src/include/unistd.h#4 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/archive_entry_private.h#3 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/gen/Makefile.inc#4 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/gen/modf.3#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/gen/sysctl.3#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/rpc/svc_vc.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/stdtime/localtime.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/sys/Makefile.inc#5 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/sys/Symbol.map#5 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/sys/cpuset.2#1 branch .. //depot/projects/mips2-jnpr/src/lib/libc/sys/cpuset_getaffinity.2#1 branch .. //depot/projects/mips2-jnpr/src/lib/libc/sys/mincore.2#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/xdr/xdr_rec.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libthr/Makefile#4 integrate .. //depot/projects/mips2-jnpr/src/lib/libthr/thread/thr_cond.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libthr/thread/thr_private.h#3 integrate .. //depot/projects/mips2-jnpr/src/lib/libthr/thread/thr_rwlock.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libthr/thread/thr_umtx.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libthr/thread/thr_umtx.h#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/Makefile#4 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/Symbol.map#4 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/amd64/Makefile.inc#4 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/amd64/e_remainderl.S#1 branch .. //depot/projects/mips2-jnpr/src/lib/msun/amd64/s_remquol.S#1 branch .. //depot/projects/mips2-jnpr/src/lib/msun/i387/Makefile.inc#4 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/i387/e_remainderl.S#1 branch .. //depot/projects/mips2-jnpr/src/lib/msun/i387/s_remquol.S#1 branch .. //depot/projects/mips2-jnpr/src/lib/msun/man/csqrt.3#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/man/hypot.3#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/man/remainder.3#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_hypot.c#3 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_hypotf.c#3 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_hypotl.c#1 branch .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_log.c#3 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_logf.c#3 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_remainder.c#3 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_remainderl.c#1 branch .. //depot/projects/mips2-jnpr/src/lib/msun/src/math.h#4 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_csqrt.c#3 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_csqrtl.c#1 branch .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_expm1.c#3 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_expm1f.c#3 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_fmaf.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_log1p.c#3 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_log1pf.c#3 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_remquo.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_remquol.c#1 branch .. //depot/projects/mips2-jnpr/src/lib/msun/src/w_cabs.c#3 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/w_cabsl.c#1 branch .. //depot/projects/mips2-jnpr/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#5 integrate .. //depot/projects/mips2-jnpr/src/rescue/rescue/Makefile#3 integrate .. //depot/projects/mips2-jnpr/src/sbin/dhclient/dhclient-script#3 integrate .. //depot/projects/mips2-jnpr/src/sbin/ggate/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/sbin/ifconfig/ifclone.c#2 integrate .. //depot/projects/mips2-jnpr/src/sbin/ifconfig/ifconfig.c#2 integrate .. //depot/projects/mips2-jnpr/src/sbin/ifconfig/ifconfig.h#2 integrate .. //depot/projects/mips2-jnpr/src/sbin/ifconfig/ifvlan.c#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man3/Makefile#3 integrate .. //depot/projects/mips2-jnpr/src/share/man/man4/Makefile#4 integrate .. //depot/projects/mips2-jnpr/src/share/man/man4/arcmsr.4#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man4/ng_pptpgre.4#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man4/ubsa.4#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man5/rc.conf.5#4 integrate .. //depot/projects/mips2-jnpr/src/share/man/man5/src.conf.5#3 integrate .. //depot/projects/mips2-jnpr/src/share/man/man8/rc.subr.8#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man9/Makefile#5 integrate .. //depot/projects/mips2-jnpr/src/share/man/man9/lock.9#5 integrate .. //depot/projects/mips2-jnpr/src/share/man/man9/rwlock.9#3 integrate .. //depot/projects/mips2-jnpr/src/share/mk/bsd.own.mk#4 integrate .. //depot/projects/mips2-jnpr/src/sys/amd64/amd64/pmap.c#5 integrate .. //depot/projects/mips2-jnpr/src/sys/amd64/conf/GENERIC#4 integrate .. //depot/projects/mips2-jnpr/src/sys/amd64/conf/NOTES#4 integrate .. //depot/projects/mips2-jnpr/src/sys/amd64/include/clock.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/amd64/include/param.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/amd64/include/timerreg.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/amd64/isa/clock.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/arm/conf/AVILA#5 integrate .. //depot/projects/mips2-jnpr/src/sys/arm/conf/BWCT#2 integrate .. //depot/projects/mips2-jnpr/src/sys/arm/conf/CRB#2 integrate .. //depot/projects/mips2-jnpr/src/sys/arm/conf/EP80219#2 integrate .. //depot/projects/mips2-jnpr/src/sys/arm/conf/HL200#2 integrate .. //depot/projects/mips2-jnpr/src/sys/arm/conf/IQ31244#2 integrate .. //depot/projects/mips2-jnpr/src/sys/arm/conf/KB920X#2 integrate .. //depot/projects/mips2-jnpr/src/sys/arm/conf/SIMICS#2 integrate .. //depot/projects/mips2-jnpr/src/sys/arm/conf/SKYEYE#2 integrate .. //depot/projects/mips2-jnpr/src/sys/arm/include/param.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/boot/forth/loader.conf#2 integrate .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/kern/opensolaris_kstat.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/kern/opensolaris_string.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/kern/opensolaris_zone.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/machine/endian.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/rpc/xdr.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/sys/acl.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/sys/atomic.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/sys/bitmap.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/sys/byteorder.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/sys/callb.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/sys/cmn_err.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/sys/cpupart.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/sys/cpuvar.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/sys/cred.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/sys/cyclic.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/sys/debug.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/sys/dirent.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/sys/dkio.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/sys/dnlc.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/sys/elf.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/sys/kcondvar.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/sys/kmem.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/sys/kobj.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/sys/kstat.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/sys/lock.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/sys/misc.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/sys/mman.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/sys/mntent.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/sys/mnttab.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/sys/modctl.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/sys/mount.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/sys/mutex.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/sys/objfs.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/sys/param.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/sys/pcpu.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/sys/policy.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/sys/proc.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/sys/random.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/sys/rwlock.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/sys/sdt.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/sys/stat.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/sys/string.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/sys/sunddi.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/sys/sysmacros.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/sys/systm.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/sys/taskq.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/sys/taskq_impl.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/sys/time.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/sys/types.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/sys/uio.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/sys/varargs.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/sys/vfs.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/sys/vnode.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/sys/zone.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/common/atomic/i386/atomic.S#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/common/atomic/ia64/atomic.S#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/common/avl/avl.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/Makefile.files#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bplist.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/gzip.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sha256.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/unique.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/os/callb.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/os/list.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/os/taskq.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_array.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_mem.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/sys/asm_linkage.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/sys/avl_impl.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/sys/bitmap.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/sys/byteorder.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/sys/callb.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/sys/ccompile.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/sys/compress.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/sys/cred.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/sys/dkio.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/sys/dklabel.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/sys/errorq.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/sys/feature_tests.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/sys/fm/protocol.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/sys/fm/util.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/sys/gfs.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/sys/list.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/sys/list_impl.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/sys/note.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair_impl.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/sys/processor.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/sys/procset.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/sys/sdt.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/sys/synch.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/sys/vmem.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/sys/zmod.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/zmod/adler32.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/zmod/deflate.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/zmod/deflate.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inffast.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inffast.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inffixed.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inflate.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inflate.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inftrees.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inftrees.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/zmod/trees.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zconf.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zlib.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod_subr.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zutil.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zutil.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/compat/freebsd32/freebsd32_misc.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/compat/freebsd32/freebsd32_proto.h#5 integrate .. //depot/projects/mips2-jnpr/src/sys/compat/freebsd32/freebsd32_syscall.h#5 integrate .. //depot/projects/mips2-jnpr/src/sys/compat/freebsd32/freebsd32_syscalls.c#5 integrate .. //depot/projects/mips2-jnpr/src/sys/compat/freebsd32/freebsd32_sysent.c#5 integrate .. //depot/projects/mips2-jnpr/src/sys/compat/freebsd32/syscalls.master#5 integrate .. //depot/projects/mips2-jnpr/src/sys/compat/linprocfs/linprocfs.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/compat/linux/linux_uid16.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/compat/linux/linux_util.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/kern/opensolaris_kmem.c#3 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/kern/opensolaris_kobj.c#3 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/kern/opensolaris_kstat.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/kern/opensolaris_misc.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/kern/opensolaris_policy.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/kern/opensolaris_string.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/kern/opensolaris_vfs.c#3 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/kern/opensolaris_zone.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/machine/endian.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/rpc/xdr.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/sys/acl.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/sys/atomic.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/sys/bitmap.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/sys/byteorder.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/sys/callb.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/sys/cmn_err.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/sys/cpupart.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/sys/cpuvar.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/sys/cred.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/sys/cyclic.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/sys/debug.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/sys/dirent.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/sys/dkio.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/sys/dnlc.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/sys/elf.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/sys/kcondvar.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/sys/kmem.h#3 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/sys/kobj.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/sys/kstat.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/sys/lock.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/sys/misc.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/sys/mman.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/sys/mntent.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/sys/mnttab.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/sys/modctl.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/sys/mount.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/sys/mutex.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/sys/objfs.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/sys/param.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/sys/pcpu.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/sys/policy.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/sys/proc.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/sys/random.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/sys/rwlock.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/sys/sdt.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/sys/stat.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/sys/string.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/sys/sunddi.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/sys/sysmacros.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/sys/systm.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/sys/taskq.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/sys/taskq_impl.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/sys/time.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/sys/types.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/sys/uio.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/sys/varargs.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/sys/vfs.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/sys/vnode.h#3 delete .. //depot/projects/mips2-jnpr/src/sys/compat/opensolaris/sys/zone.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/compat/pecoff/imgact_pecoff.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/compat/svr4/svr4_sysvec.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/conf/NOTES#7 integrate .. //depot/projects/mips2-jnpr/src/sys/conf/files#9 integrate .. //depot/projects/mips2-jnpr/src/sys/conf/options#7 integrate .. //depot/projects/mips2-jnpr/src/sys/conf/options.amd64#2 integrate .. //depot/projects/mips2-jnpr/src/sys/conf/options.i386#2 integrate .. //depot/projects/mips2-jnpr/src/sys/conf/options.pc98#2 integrate .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/OPENSOLARIS.LICENSE#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/common/acl/acl_common.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/common/acl/acl_common.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/common/atomic/i386/atomic.S#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/common/atomic/ia64/atomic.S#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/common/avl/avl.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/common/nvpair/nvpair.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/common/zfs/zfs_namecheck.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/common/zfs/zfs_namecheck.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/common/zfs/zfs_prop.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/common/zfs/zfs_prop.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/Makefile.files#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/gfs.c#3 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#3 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/bplist.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/dnode.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/gzip.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/refcount.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/sha256.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/space_map.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/txg.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/unique.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#3 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#3 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#3 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#6 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#3 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/os/callb.c#3 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/os/list.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/os/taskq.c#3 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/rpc/xdr.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/rpc/xdr.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/rpc/xdr_array.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/rpc/xdr_mem.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/sys/asm_linkage.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/sys/avl.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/sys/avl_impl.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/sys/bitmap.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/sys/byteorder.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/sys/callb.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/sys/ccompile.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/sys/compress.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/sys/cred.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/sys/debug.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/sys/dkio.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/sys/dklabel.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/sys/errorq.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/sys/feature_tests.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/sys/fm/protocol.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/sys/fm/util.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/sys/fs/zfs.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/sys/gfs.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/sys/list.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/sys/list_impl.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/sys/note.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/sys/nvpair.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/sys/nvpair_impl.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/sys/processor.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/sys/procset.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/sys/sdt.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/sys/synch.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/sys/sysevent.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/sys/vmem.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/sys/zmod.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/zmod/adler32.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/zmod/crc32.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/zmod/crc32.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/zmod/deflate.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/zmod/deflate.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/zmod/inffast.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/zmod/inffast.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/zmod/inffixed.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/zmod/inflate.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/zmod/inflate.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/zmod/inftrees.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/zmod/inftrees.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/zmod/trees.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/zmod/zconf.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/zmod/zlib.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/zmod/zmod.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/zmod/zmod_subr.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/zmod/zutil.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/zmod/zutil.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/contrib/pf/net/pf_if.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/contrib/pf/net/pfvar.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/aac/aac.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/cxgb/cxgb_adapter.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/cxgb/sys/cxgb_support.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/malo/if_malohal.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/mpt/mpt.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/re/if_re.c#5 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/speaker/spkr.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/syscons/syscons.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/usb/ubsa.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/usb/usbdevs#6 integrate .. //depot/projects/mips2-jnpr/src/sys/fs/coda/coda_vfsops.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/fs/msdosfs/msdosfs_vfsops.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/fs/nullfs/null_subr.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/fs/nullfs/null_vfsops.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/fs/unionfs/union_vfsops.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/geom/geom_subr.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/geom/part/g_part.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/geom/part/g_part_pc98.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/i386/conf/GENERIC#4 integrate .. //depot/projects/mips2-jnpr/src/sys/i386/conf/NOTES#4 integrate .. //depot/projects/mips2-jnpr/src/sys/i386/conf/XBOX#2 integrate .. //depot/projects/mips2-jnpr/src/sys/i386/i386/busdma_machdep.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/i386/i386/pmap.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/i386/i386/trap.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/i386/ibcs2/ibcs2_util.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/i386/include/clock.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/i386/include/param.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/i386/include/pmap.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/i386/include/timerreg.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/i386/isa/clock.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/i386/linux/linux_sysvec.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/ia64/conf/GENERIC#3 integrate .. //depot/projects/mips2-jnpr/src/sys/ia64/ia64/elf_machdep.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/ia64/ia64/machdep.c#5 integrate .. //depot/projects/mips2-jnpr/src/sys/ia64/ia64/pmap.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/ia64/include/clock.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/ia64/include/md_var.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/ia64/include/param.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/isa/syscons_isa.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/init_sysent.c#6 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/kern_cpuset.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/kern_exec.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/kern_jail.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/kern_lockf.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/kern_rwlock.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/kern_umtx.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/makesyscalls.sh#3 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/syscalls.c#6 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/syscalls.master#6 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/systrace_args.c#6 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/tty_cons.c#5 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/uipc_mqueue.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/vfs_acl.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/vfs_bio.c#6 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/vfs_cache.c#5 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/vfs_extattr.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/vfs_lookup.c#5 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/vfs_mount.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/vfs_subr.c#7 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/vfs_syscalls.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/vfs_vnops.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/modules/Makefile#4 integrate .. //depot/projects/mips2-jnpr/src/sys/modules/bktr/bktr/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/sys/modules/em/Makefile#3 integrate .. //depot/projects/mips2-jnpr/src/sys/modules/geom/geom_part/Makefile#3 integrate .. //depot/projects/mips2-jnpr/src/sys/modules/geom/geom_part/geom_part_pc98/Makefile#1 branch .. //depot/projects/mips2-jnpr/src/sys/modules/igb/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/sys/modules/ixgbe/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/sys/modules/krpc/Makefile#1 branch .. //depot/projects/mips2-jnpr/src/sys/modules/nfslockd/Makefile#1 branch .. //depot/projects/mips2-jnpr/src/sys/modules/sound/driver/emu10kx/Makefile#3 integrate .. //depot/projects/mips2-jnpr/src/sys/modules/uslcom/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/sys/modules/wpi/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/sys/modules/zfs/Makefile#4 integrate .. //depot/projects/mips2-jnpr/src/sys/net/bpf_zerocopy.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/net/if.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/netgraph/ng_base.c#7 integrate .. //depot/projects/mips2-jnpr/src/sys/netgraph/ng_car.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/netgraph/ng_pptpgre.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/netncp/ncp_conn.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/netsmb/smb_iod.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/nlm/nlm_prot_clnt.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/nlm/nlm_prot_impl.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/nlm/nlm_prot_server.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/nlm/nlm_prot_svc.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/nlm/nlm_prot_xdr.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/nlm/sm_inter_xdr.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/pc98/cbus/clock.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/pc98/cbus/syscons_cbus.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/pc98/conf/GENERIC#4 integrate .. //depot/projects/mips2-jnpr/src/sys/pc98/conf/NOTES#3 integrate .. //depot/projects/mips2-jnpr/src/sys/pc98/include/clock.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/pc98/include/timerreg.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/pci/if_rlreg.h#5 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/aim/clock.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/booke/clock.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/conf/GENERIC#3 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/include/clock.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/include/param.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/rpc/auth_unix.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/rpc/authunix_prot.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/rpc/clnt_dg.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/rpc/clnt_rc.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/rpc/clnt_vc.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/rpc/inet_ntop.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/rpc/inet_pton.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/rpc/rpc_generic.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/rpc/rpcb_clnt.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/rpc/svc.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/rpc/svc_auth_unix.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/rpc/svc_dg.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/rpc/svc_generic.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/rpc/svc_vc.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/security/mac/mac_syscalls.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/sparc64/conf/GENERIC#4 integrate .. //depot/projects/mips2-jnpr/src/sys/sparc64/include/clock.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/sparc64/include/param.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/sparc64/sparc64/clock.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/sun4v/conf/GENERIC#2 integrate .. //depot/projects/mips2-jnpr/src/sys/sun4v/include/clock.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/sun4v/include/param.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/aac_ioctl.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/buf.h#6 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/cpuset.h#4 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/fcntl.h#5 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/imgact.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/lockmgr.h#5 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/mman.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/namei.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/param.h#7 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/rwlock.h#4 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/stat.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/syscall.h#6 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/syscall.mk#6 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/syscallsubr.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/sysproto.h#6 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/systm.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/time.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/umtx.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/vnode.h#5 integrate .. //depot/projects/mips2-jnpr/src/sys/ufs/ffs/ffs_snapshot.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/ufs/ffs/ffs_vfsops.c#5 integrate .. //depot/projects/mips2-jnpr/src/sys/ufs/ffs/ffs_vnops.c#5 integrate .. //depot/projects/mips2-jnpr/src/sys/vm/vm_kern.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/vm/vm_object.c#4 integrate .. //depot/projects/mips2-jnpr/src/tools/build/mk/OptionalObsoleteFiles.inc#5 integrate .. //depot/projects/mips2-jnpr/src/tools/build/options/WITHOUT_LIBKSE#2 delete .. //depot/projects/mips2-jnpr/src/tools/regression/lib/msun/test-csqrt.c#2 integrate .. //depot/projects/mips2-jnpr/src/tools/regression/lib/msun/test-rem.c#2 integrate .. //depot/projects/mips2-jnpr/src/usr.bin/Makefile#6 integrate .. //depot/projects/mips2-jnpr/src/usr.bin/awk/Makefile#3 integrate .. //depot/projects/mips2-jnpr/src/usr.bin/fstat/zfs/Makefile#3 integrate .. //depot/projects/mips2-jnpr/src/usr.sbin/Makefile#5 integrate .. //depot/projects/mips2-jnpr/src/usr.sbin/amd/amd/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/usr.sbin/clear_locks/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/usr.sbin/fifolog/fifolog_reader/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/usr.sbin/fifolog/fifolog_reader/fifolog_reader.c#2 integrate .. //depot/projects/mips2-jnpr/src/usr.sbin/ngctl/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/usr.sbin/pkg_install/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/usr.sbin/pkg_install/add/perform.c#2 integrate .. //depot/projects/mips2-jnpr/src/usr.sbin/pkg_install/sign/Makefile#2 delete .. //depot/projects/mips2-jnpr/src/usr.sbin/pkg_install/sign/README#2 delete .. //depot/projects/mips2-jnpr/src/usr.sbin/pkg_install/sign/check.c#2 delete .. //depot/projects/mips2-jnpr/src/usr.sbin/pkg_install/sign/common.c#2 delete .. //depot/projects/mips2-jnpr/src/usr.sbin/pkg_install/sign/extern.h#2 delete .. //depot/projects/mips2-jnpr/src/usr.sbin/pkg_install/sign/gzip.c#2 delete .. //depot/projects/mips2-jnpr/src/usr.sbin/pkg_install/sign/gzip.h#2 delete .. //depot/projects/mips2-jnpr/src/usr.sbin/pkg_install/sign/main.c#2 delete .. //depot/projects/mips2-jnpr/src/usr.sbin/pkg_install/sign/pgp.h#2 delete .. //depot/projects/mips2-jnpr/src/usr.sbin/pkg_install/sign/pgp_check.c#2 delete .. //depot/projects/mips2-jnpr/src/usr.sbin/pkg_install/sign/pgp_sign.c#2 delete .. //depot/projects/mips2-jnpr/src/usr.sbin/pkg_install/sign/pkg_sign.1#2 delete .. //depot/projects/mips2-jnpr/src/usr.sbin/pkg_install/sign/sha1.c#2 delete .. //depot/projects/mips2-jnpr/src/usr.sbin/pkg_install/sign/sign.c#2 delete .. //depot/projects/mips2-jnpr/src/usr.sbin/pkg_install/sign/stand.c#2 delete .. //depot/projects/mips2-jnpr/src/usr.sbin/pkg_install/sign/stand.h#2 delete .. //depot/projects/mips2-jnpr/src/usr.sbin/pkg_install/sign/x509.c#2 delete .. //depot/projects/mips2-jnpr/src/usr.sbin/rpc.lockd/lockd.c#3 integrate .. //depot/projects/mips2-jnpr/src/usr.sbin/rpc.lockd/rpc.lockd.8#3 integrate Differences ... ==== //depot/projects/mips2-jnpr/src/Makefile#7 (text+ko) ==== @@ -1,6 +1,6 @@ #OSX hint: bsdmake BSDMKAE=bsdmake MACHINE_ARCH=i386 # -# $FreeBSD: src/Makefile,v 1.346 2008/03/25 15:47:22 ru Exp $ +# $FreeBSD: src/Makefile,v 1.347 2008/03/31 13:32:55 pav Exp $ # # The user-driven targets are: # @@ -37,7 +37,7 @@ # The user-driven targets (as listed above) are implemented in Makefile.inc1. # # If you want to build your system from source be sure that /usr/obj has -# at least 400MB of diskspace available. +# at least 800MB of diskspace available. # # For individuals wanting to build from the sources currently on their # system, the simple instructions are: ==== //depot/projects/mips2-jnpr/src/Makefile.inc1#9 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.601 2008/03/02 11:10:46 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.602 2008/03/29 17:44:38 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -1015,18 +1015,14 @@ ${_lib_libgssapi} ${_lib_libipx} \ lib/libkiconv lib/libkvm lib/libmd \ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Apr 2 09:55:54 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A92351065671; Wed, 2 Apr 2008 09:55:54 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6935A106566C for ; Wed, 2 Apr 2008 09:55:54 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 57C7E8FC22 for ; Wed, 2 Apr 2008 09:55:54 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m329ts3R084902 for ; Wed, 2 Apr 2008 09:55:54 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m329tspB084900 for perforce@freebsd.org; Wed, 2 Apr 2008 09:55:54 GMT (envelope-from gonzo@FreeBSD.org) Date: Wed, 2 Apr 2008 09:55:54 GMT Message-Id: <200804020955.m329tspB084900@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 139201 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Apr 2008 09:55:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=139201 Change 139201 by gonzo@gonzo_jeeves on 2008/04/02 09:55:22 o With new (optional) speaker API by phk we don't need sysbeep stub any more. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/include/clock.h#9 edit .. //depot/projects/mips2-jnpr/src/sys/mips/mips/tick.c#10 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/include/clock.h#9 (text+ko) ==== @@ -30,7 +30,6 @@ void mips_timer_early_init(uint64_t clock_hz); void mips_timer_init_params(uint64_t, int); -int sysbeep(int pitch, int period); extern uint64_t counter_freq; extern int clocks_running; ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/tick.c#10 (text+ko) ==== @@ -241,14 +241,6 @@ } } - -int -sysbeep(int pitch, int period) -{ - - return (0); -} - #ifdef TARGET_OCTEON int64_t wheel_run = 0; From owner-p4-projects@FreeBSD.ORG Wed Apr 2 16:09:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 563AF106566B; Wed, 2 Apr 2008 16:09:59 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0ABA61065672 for ; Wed, 2 Apr 2008 16:09:59 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EAC768FC26 for ; Wed, 2 Apr 2008 16:09:58 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m32G9wqh016922 for ; Wed, 2 Apr 2008 16:09:58 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m32G9wtE016920 for perforce@freebsd.org; Wed, 2 Apr 2008 16:09:58 GMT (envelope-from sam@freebsd.org) Date: Wed, 2 Apr 2008 16:09:58 GMT Message-Id: <200804021609.m32G9wtE016920@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 139219 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Apr 2008 16:10:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=139219 Change 139219 by sam@sam_ebb on 2008/04/02 16:09:12 switch to regulat bitops and allocate 32 bits; using bit vector stuff seems like overkill Affected files ... .. //depot/projects/vap/sys/dev/ath/if_ath.c#56 edit .. //depot/projects/vap/sys/dev/if_ndis/if_ndis.c#10 edit .. //depot/projects/vap/sys/dev/mwl/if_mwl.c#3 edit .. //depot/projects/vap/sys/dev/wi/if_wi.c#22 edit .. //depot/projects/vap/sys/net80211/ieee80211.c#33 edit .. //depot/projects/vap/sys/net80211/ieee80211_crypto.c#12 edit .. //depot/projects/vap/sys/net80211/ieee80211_crypto.h#12 edit .. //depot/projects/vap/sys/net80211/ieee80211_ddb.c#10 edit .. //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#50 edit .. //depot/projects/vap/sys/net80211/ieee80211_var.h#36 edit Differences ... ==== //depot/projects/vap/sys/dev/ath/if_ath.c#56 (text+ko) ==== @@ -524,22 +524,22 @@ * Query the hal to figure out h/w crypto support. */ if (ath_hal_ciphersupported(ah, HAL_CIPHER_WEP)) - setbit(ic->ic_cryptocaps, IEEE80211_CIPHER_WEP); + ic->ic_cryptocaps |= IEEE80211_CRYPTO_WEP; if (ath_hal_ciphersupported(ah, HAL_CIPHER_AES_OCB)) - setbit(ic->ic_cryptocaps, IEEE80211_CIPHER_AES_OCB); + ic->ic_cryptocaps |= IEEE80211_CRYPTO_AES_OCB; if (ath_hal_ciphersupported(ah, HAL_CIPHER_AES_CCM)) - setbit(ic->ic_cryptocaps, IEEE80211_CIPHER_AES_CCM); + ic->ic_cryptocaps |= IEEE80211_CRYPTO_AES_CCM; if (ath_hal_ciphersupported(ah, HAL_CIPHER_CKIP)) - setbit(ic->ic_cryptocaps, IEEE80211_CIPHER_CKIP); + ic->ic_cryptocaps |= IEEE80211_CRYPTO_CKIP; if (ath_hal_ciphersupported(ah, HAL_CIPHER_TKIP)) { - setbit(ic->ic_cryptocaps, IEEE80211_CIPHER_TKIP); + ic->ic_cryptocaps |= IEEE80211_CRYPTO_TKIP; /* * Check if h/w does the MIC and/or whether the * separate key cache entries are required to * handle both tx+rx MIC keys. */ if (ath_hal_ciphersupported(ah, HAL_CIPHER_MIC)) - setbit(ic->ic_cryptocaps, IEEE80211_CIPHER_TKIPMIC); + ic->ic_cryptocaps |= IEEE80211_CRYPTO_TKIPMIC; /* * If the h/w supports storing tx+rx MIC keys * in one cache slot automatically enable use. ==== //depot/projects/vap/sys/dev/if_ndis/if_ndis.c#10 (text+ko) ==== @@ -872,22 +872,22 @@ arg = NDIS_80211_WEPSTAT_ENC3ENABLED; r = ndis_set_info(sc, OID_802_11_ENCRYPTION_STATUS, &arg, &i); if (r == 0) { - setbit(ic->ic_cryptocaps, IEEE80211_CIPHER_WEP); - setbit(ic->ic_cryptocaps, IEEE80211_CIPHER_TKIP); - setbit(ic->ic_cryptocaps, IEEE80211_CIPHER_AES_CCM); + ic->ic_cryptocaps |= IEEE80211_CRYPTO_WEP + | IEEE80211_CRYPTO_TKIP + | IEEE80211_CRYPTO_AES_CCM; goto got_crypto; } arg = NDIS_80211_WEPSTAT_ENC2ENABLED; r = ndis_set_info(sc, OID_802_11_ENCRYPTION_STATUS, &arg, &i); if (r == 0) { - setbit(ic->ic_cryptocaps, IEEE80211_CIPHER_WEP); - setbit(ic->ic_cryptocaps, IEEE80211_CIPHER_TKIP); + ic->ic_cryptocaps |= IEEE80211_CRYPTO_WEP + | IEEE80211_CRYPTO_TKIP; goto got_crypto; } arg = NDIS_80211_WEPSTAT_ENC1ENABLED; r = ndis_set_info(sc, OID_802_11_ENCRYPTION_STATUS, &arg, &i); if (r == 0) - setbit(ic->ic_cryptocaps, IEEE80211_CIPHER_WEP); + ic->ic_cryptocaps |= IEEE80211_CRYPTO_WEP; got_crypto: i = sizeof(arg); r = ndis_get_info(sc, OID_802_11_POWER_MODE, &arg, &i); @@ -2063,19 +2063,19 @@ len = sizeof(arg); if (cipher == WPA_CSE_WEP40 || WPA_CSE_WEP104) { - if (!isset(ic->ic_cryptocaps, IEEE80211_CIPHER_WEP)) + if (!(ic->ic_cryptocaps & IEEE80211_CRYPTO_WEP)) return(ENOTSUP); arg = NDIS_80211_WEPSTAT_ENC1ENABLED; } if (cipher == WPA_CSE_TKIP) { - if (!isset(ic->ic_cryptocaps, IEEE80211_CIPHER_TKIP)) + if (!(ic->ic_cryptocaps & IEEE80211_CRYPTO_TKIP)) return(ENOTSUP); arg = NDIS_80211_WEPSTAT_ENC2ENABLED; } if (cipher == WPA_CSE_CCMP) { - if (!isset(ic->ic_cryptocaps, IEEE80211_CIPHER_AES_CCM)) + if (!(ic->ic_cryptocaps & IEEE80211_CRYPTO_AES_CCM)) return(ENOTSUP); arg = NDIS_80211_WEPSTAT_ENC3ENABLED; } ==== //depot/projects/vap/sys/dev/mwl/if_mwl.c#3 (text+ko) ==== @@ -468,11 +468,11 @@ * Mark h/w crypto support. * XXX no way to query h/w support. */ - setbit(ic->ic_cryptocaps, IEEE80211_CIPHER_WEP); - setbit(ic->ic_cryptocaps, IEEE80211_CIPHER_AES_CCM); - setbit(ic->ic_cryptocaps, IEEE80211_CIPHER_TKIP); - setbit(ic->ic_cryptocaps, IEEE80211_CIPHER_TKIPMIC); - + ic->ic_cryptocaps |= IEEE80211_CRYPTO_WEP + | IEEE80211_CRYPTO_AES_CCM + | IEEE80211_CRYPTO_TKIP + | IEEE80211_CRYPTO_TKIPMIC + ; /* * Transmit requires space in the packet for a special * format transmit record and optional padding between ==== //depot/projects/vap/sys/dev/wi/if_wi.c#22 (text+ko) ==== @@ -407,7 +407,7 @@ buflen = sizeof(val); if (wi_read_rid(sc, WI_RID_WEP_AVAIL, &val, &buflen) == 0 && val != htole16(0)) - setbit(ic->ic_cryptocaps, IEEE80211_CIPHER_WEP); + ic->ic_cryptocaps |= IEEE80211_CRYPTO_WEP; /* Find supported rates. */ buflen = sizeof(ratebuf); @@ -826,7 +826,7 @@ ieee80211_chan2ieee(ic, bss->ni_chan)); /* Configure WEP. */ - if (isset(ic->ic_cryptocaps, IEEE80211_CIPHER_WEP)) + if (ic->ic_cryptocaps & IEEE80211_CRYPTO_WEP) wi_write_wep(sc, vap); else sc->sc_encryption = 0; @@ -916,7 +916,7 @@ wi_write_val(sc, WI_RID_PROMISC, 0); /* Configure WEP. */ - if (isset(ic->ic_cryptocaps, IEEE80211_CIPHER_WEP)) + if (ic->ic_cryptocaps & IEEE80211_CRYPTO_WEP) wi_write_wep(sc, vap); else sc->sc_encryption = 0; ==== //depot/projects/vap/sys/net80211/ieee80211.c#33 (text+ko) ==== @@ -324,13 +324,7 @@ vap->iv_flags_ext = ic->ic_flags_ext; vap->iv_flags_ven = ic->ic_flags_ven; vap->iv_caps = ic->ic_caps &~ IEEE80211_C_OPMODE; - vap->iv_cryptocaps[0] = ic->ic_cryptocaps[0]; -#if IEEE80211_CIPHER_MAX > 8 - vap->iv_cryptocaps[1] = ic->ic_cryptocaps[1]; -#endif -#if IEEE80211_CIPHER_MAX > 16 -#error "too many crypto capability bits" -#endif + vap->iv_cryptocaps = ic->ic_cryptocaps; vap->iv_htcaps = ic->ic_htcaps; vap->iv_opmode = opmode; switch (opmode) { ==== //depot/projects/vap/sys/net80211/ieee80211_crypto.c#12 (text+ko) ==== @@ -309,7 +309,7 @@ * If the hardware does not support the cipher then * fallback to a host-based implementation. */ - if (!isset(vap->iv_cryptocaps, cipher)) { + if ((vap->iv_cryptocaps & (1<ic_name); @@ -321,7 +321,7 @@ * the cipher modules honor it. */ if (cipher == IEEE80211_CIPHER_TKIP && - !isset(vap->iv_cryptocaps, IEEE80211_CIPHER_TKIPMIC)) { + (vap->iv_cryptocaps & IEEE80211_CRYPTO_TKIPMIC) == 0) { IEEE80211_DPRINTF(vap, IEEE80211_MSG_CRYPTO, "%s: no h/w support for TKIP MIC, falling back to s/w\n", __func__); ==== //depot/projects/vap/sys/net80211/ieee80211_crypto.h#12 (text+ko) ==== @@ -94,6 +94,8 @@ #define IEEE80211_KEY_COMMON /* common flags passed in by apps */\ (IEEE80211_KEY_XMIT | IEEE80211_KEY_RECV | IEEE80211_KEY_GROUP) +#define IEEE80211_KEYIX_NONE ((ieee80211_keyix) -1) + /* * NB: these values are ordered carefully; there are lots of * of implications in any reordering. Beware that 4 is used @@ -111,7 +113,13 @@ #define IEEE80211_CIPHER_MAX (IEEE80211_CIPHER_NONE+1) -#define IEEE80211_KEYIX_NONE ((ieee80211_keyix) -1) +/* capability bits in ic_cryptocaps/iv_cryptocaps */ +#define IEEE80211_CRYPTO_WEP (1<iv_flags_ven, IEEE80211_FVEN_BITS); db_printf("\tcaps=%b\n", vap->iv_caps, IEEE80211_C_BITS); db_printf("\tcryptocaps=%b\n", - vap->iv_cryptocaps[0], IEEE80211_C_CRYPTO_BITS); + vap->iv_cryptocaps, IEEE80211_C_CRYPTO_BITS); db_printf("\thtcaps=%b\n", vap->iv_htcaps, IEEE80211_C_HTCAP_BITS); _db_show_stats(&vap->iv_stats); @@ -490,7 +490,7 @@ db_printf("\tflags_ven=%b\n", ic->ic_flags_ven, IEEE80211_FVEN_BITS); db_printf("\tcaps=%b\n", ic->ic_caps, IEEE80211_C_BITS); db_printf("\tcryptocaps=%b\n", - ic->ic_cryptocaps[0], IEEE80211_C_CRYPTO_BITS); + ic->ic_cryptocaps, IEEE80211_C_CRYPTO_BITS); db_printf("\thtcaps=%b\n", ic->ic_htcaps, IEEE80211_HTCAP_BITS); #if 0 ==== //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#50 (text+ko) ==== @@ -701,13 +701,7 @@ if (dc == NULL) return ENOMEM; dc->dc_drivercaps = ic->ic_caps; -#if IEEE80211_CIPHER_MAX <= 8 - dc->dc_cryptocaps = ic->ic_cryptocaps[0]; -#elif IEEE80211_CIPHER_MAX <= 16 - dc->dc_cryptocaps = (ic->ic_cryptocaps[0]<<8) | ic->ic_cryptocaps[1]; -#else -#error "too many crypto capability bits" -#endif + dc->dc_cryptocaps = ic->ic_cryptocaps; dc->dc_htcaps = ic->ic_htcaps; ci = &dc->dc_chaninfo; ic->ic_getradiocaps(ic, &ci->ic_nchans, ci->ic_chans); ==== //depot/projects/vap/sys/net80211/ieee80211_var.h#36 (text+ko) ==== @@ -122,7 +122,7 @@ uint32_t ic_flags_ven; /* vendor state flags */ uint32_t ic_caps; /* capabilities */ uint32_t ic_htcaps; /* HT capabilities */ - uint8_t ic_cryptocaps[1];/* crypto capabilities */ + uint32_t ic_cryptocaps; /* crypto capabilities */ uint8_t ic_modecaps[2]; /* set of mode capabilities */ uint8_t ic_promisc; /* vap's needing promisc mode */ uint8_t ic_allmulti; /* vap's needing all multicast*/ @@ -293,7 +293,7 @@ uint32_t iv_flags_ven; /* vendor state flags */ uint32_t iv_caps; /* capabilities */ uint32_t iv_htcaps; /* HT capabilities */ - uint8_t iv_cryptocaps[1];/* crypto capabilities */ + uint32_t iv_cryptocaps; /* crypto capabilities */ enum ieee80211_opmode iv_opmode; /* operation mode */ enum ieee80211_state iv_state; /* state machine state */ void (*iv_newstate_cb)(struct ieee80211vap *, From owner-p4-projects@FreeBSD.ORG Wed Apr 2 18:31:31 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 80629106566C; Wed, 2 Apr 2008 18:31:31 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 40390106564A for ; Wed, 2 Apr 2008 18:31:31 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 124F58FC14 for ; Wed, 2 Apr 2008 18:31:31 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m32IVU2n047920 for ; Wed, 2 Apr 2008 18:31:30 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m32IVUe7047918 for perforce@freebsd.org; Wed, 2 Apr 2008 18:31:30 GMT (envelope-from imp@freebsd.org) Date: Wed, 2 Apr 2008 18:31:30 GMT Message-Id: <200804021831.m32IVUe7047918@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 139230 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Apr 2008 18:31:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=139230 Change 139230 by imp@imp_lighthouse on 2008/04/02 18:31:30 These aren't used. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/drivers/sio/ns16550.c#3 delete .. //depot/projects/mips2-jnpr/src/sys/mips/drivers/sio/sio.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/mips/drivers/sio/sio_isa.c#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Wed Apr 2 18:49:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 20BE11065670; Wed, 2 Apr 2008 18:49:51 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D36CE106566B for ; Wed, 2 Apr 2008 18:49:50 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B27D78FC19 for ; Wed, 2 Apr 2008 18:49:50 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m32InoYm048828 for ; Wed, 2 Apr 2008 18:49:50 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m32InoCt048826 for perforce@freebsd.org; Wed, 2 Apr 2008 18:49:50 GMT (envelope-from pgj@FreeBSD.org) Date: Wed, 2 Apr 2008 18:49:50 GMT Message-Id: <200804021849.m32InoCt048826@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 139232 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Apr 2008 18:49:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=139232 Change 139232 by pgj@disznohal on 2008/04/02 18:49:27 Fix format, composition, translation, typos. Submitted by: gabor (mentor) Affected files ... .. //depot/projects/docproj_hu/books/handbook/l10n/chapter.sgml#4 edit Differences ... ==== //depot/projects/docproj_hu/books/handbook/l10n/chapter.sgml#4 (text+ko) ==== @@ -31,14 +31,14 @@ Áttekintés - A &os; felhasználói és - résztvevõi földrajzi helyét tekintve a - világban nagyon szerteoszlik. Ebben a fejezetben + A &os; felhasználói földrajzi + elhelyezkedésüket tekintve mindenhol + megtalálhatóak a világon. Ebben a fejezetben ismertetjük a &os; honosításához és idegennyelvre fordításához alkalmazható eszközöket, amelyek segítségével az angolt nem, vagy csak - kevébé ismerõ felhasználók is + kevésbé ismerõ felhasználók is képesek lesznek komolyabban használni. Az i18n megvalósítása rengeteg szemszögbõl megközelíthetõ rendszer és @@ -48,40 +48,46 @@ A fejezet elolvasása során megismerjük: + - Milyen nyelveket és nyelvi + milyen nyelveket és nyelvi beállításokat találhatunk napjaink - operációs rendszereiben. + operációs rendszereiben + - Hogyan használjuk a nyelvi + hogyan használjuk a nyelvi beállításokat a saját - shellünkben. + parancsértelmezõnkben + - Hogyan állítsuk be a konzolt az angolon - kívül más nyelvekhez. + hogyan állítsuk be a konzolt az angolon + kívül más nyelvekhez + - Hogyan használjuk ténylegesen az X Window - Systemet a különbözõ nyelvekkel. + hogyan használjuk ténylegesen az X Window + Systemet a különbözõ nyelvekkel + - Hol olvashatunk többet az I18N-kompatibilis - alkalmazások - fejlesztésérõl. + hol olvashatunk többet az I18N-kompatibilis + alkalmazások fejlesztésérõl + A fejezet elolvasásához ajánlott: - Külsõs alkalmazáok + külsõ alkalmazáok telepítésének ismerete (). + linkend="ports">) + @@ -89,6 +95,7 @@ Mi az I18N/L10N? + idegennyelvûség honosítás @@ -112,9 +119,9 @@ Az I18N alkalmazások céljak eléréséhez - függvénykönyvtárakban implementált - I18N készleteket használnak. Ezzel - lehetõvé válik a fejlesztõik + függvénykönyvtárakban + implementált I18N készleteket használnak. + Ezzel lehetõvé válik a fejlesztõik számára, hogy összegyûjtsék a programukban megjelenõ összes szöveget egyetlen állományba, majd azt külön @@ -122,6 +129,7 @@ nyelvekre. Mi is ezen konvenció követésére szeretnénk bíztatni minden programozót. + @@ -130,30 +138,35 @@ Az I18N/L10N mindenhol jól jöhet, ahol idegennyelvû adatot akarunk megjeleníteni, bekérni vagy feldolgozni. + Milyen nyelveket támogat az I18N? Az I18N és L10N nem korlátozódik a &os; - tudására. Jelenleg a világban beszélt - legelterjedtebb nyelvek mindegyikét használhatjuk - bennük. Csak néhányat - megemlítünk közülük: kínai, - német, japán, koreai, francia, orosz, - vietnámi és még sok más. + tudására. Jelenleg a világban + beszélt legelterjedtebb nyelvek mindegyikét + használhatjuk bennük. Csak hogy + néhányat említsünk + közülük: kínai, német, + japán, koreai, francia, orosz, vietnámi és + még sok más. + A honosítás használata - Az I18N minden pompájával együtt + Az I18N minden adottságával együtt független a &os;-tõl, egy egyezményes rendszer. Mindenkit bátorítunk arra, hogy segítse a &os;-t ennek az egyezménynek a betartásában. - nyelvi beállítások + + nyelvi + beállítások A honosítás beállításai három fõbb részre tagolhatóak: a nyelv @@ -166,6 +179,7 @@ A nyelv és az ország kódja + nyelvi kódok országkódok @@ -178,7 +192,7 @@ az alkalmazásnak, hogy a nyelv melyik változatát használja). Ezenkívül a böngészõk, SMTP/POP - szerverek és webszerverek stb. is ennek alapján + szerverek és webszerverek stb. is ennek alapján fognak döntéseket hozni. Íme néhány nyelv/ország kódja: @@ -214,24 +228,26 @@ Kódolások + kódolások ASCII Bizonyos nyelvek 8 bites, széles vagy több - byte-os, nem ASCII kódolású karaktereket - használnak, melyekrõl a &man.multibyte.3; man - oldalán olvashatunk részletesebben. Ezeket - régebbi alkalmazások egyáltalán nem - ismerik fel, és hibásan - vezérlõkaraktereknek nézik. Az - újabbak általában már felismerik a 8 - bites karaktereket. A felhasználóknak az - alkalmazásokat a széles vagy a több byte-os - karakterek használatához vagy újra kell - fordítaniuk, vagy pedig megfelelõen be kell - állítaniuk, az + bájtos, nem ASCII kódolású + karaktereket használnak, melyekrõl a + &man.multibyte.3; man oldalán olvashatunk + részletesebben. Ezeket régebbi + alkalmazások egyáltalán nem ismerik fel, + és hibásan vezérlõkaraktereknek + tulajdonítják. Az újabbak + általában már felismerik a 8 bites + karaktereket. A felhasználóknak az + alkalmazásokat a széles vagy a több + bájtos karakterek használatához vagy + újra kell fordítaniuk, vagy pedig megfelelõen + be kell állítaniuk, az implementációtól függõen. A - széles vagy több byte-os karakterek + széles vagy több bájtos karakterek beolvasásához és feldolgozásához a &os; @@ -255,13 +271,13 @@ A nyelvfüggõ egyszerû karakteres - készletek (ld. &man.multibyte.3;), pl. ISO8859-1, + készletek (ld. &man.multibyte.3;), pl. ISO8859-1, ISO8859-15, KOI8-R, CP437. - A széles vagy több byte-os - kódolások, pl. az EUC, Big5. + A széles vagy több bájtos + kódolások, pl. az EUC, Big5. @@ -286,6 +302,7 @@ I18N megnevezést. Azonban nem minden esetben támogatják a szükséges nyelvet. + @@ -295,12 +312,13 @@ Általában elegendõ annyi, hogy a kívánt nyelvi beállítás nevét exportáljuk az általunk - használt shell LANG környezeti - változójába. Ez megtehetõ a - felhasználói könyvtárunkban - található ~/.login_conf, vagy - a felhasználói shell indító - állományában + használt parancsértelmezõ LANG + környezeti változójába. Ez + megtehetõ a felhasználói + könyvtárunkban található + ~/.login_conf, vagy a + felhasználói parancsértelmezõ + indító állományában (~/.profile, ~/.bashrc, ~/.cshrc). Nem szükséges a nyelvi @@ -312,17 +330,19 @@ meg. A következõ két környezeti - változó kell megadnunk az említett + változót kell megadnunk az említett konfigurációs állományokban: - POSIX + POSIX + A LANG változót a &posix; &man.setlocale.3; családjának - MIME + MIME + A MM_CHARSET változót az alkalmazás MIME @@ -331,27 +351,29 @@ Ez magában foglalja a felhasználói - shell, az adott alkalmazás és az X11 - beállítását. + parancsértelmezõ, az adott alkalmazás + és az X11 beállítását. A nyelvi beállítások megadásának módszerei + nyelvi beállítások bejelentkezési osztály Két módszer létezik a nyelvi - beállítások megadására, ezen - kettõrõl fogunk a továbbiakban + beállítások megadására, + ezen kettõrõl fogunk a továbbiakban beszélni. Az elsõ (és egyben ajánlott) ezek közül a bejelentkezési osztályban levõ környezeti változók beállítása, a második pedig környezeti változók - hozzáadása a rendszer shell indító állományához. @@ -360,12 +382,12 @@ osztályokkal Ezzel a módszerrel a nyelvi - beállítás nevéhez és a MIME - karakterkészlethez kötõdõ + beállítás nevéhez és a + MIME karakterkészlethez kötõdõ környezeti változókat az összes - létezõ shell számára csak egyszer - kell megadnunk ahelyett, hogy külön - mindegyikük + létezõ parancsértelmezõ + számára csak egyszer kell megadnunk ahelyett, + hogy külön mindegyikük indítóállományában szerepeltetnénk. A felhasználó a saját részét @@ -392,6 +414,7 @@ hagyományos kínaiBIG-5 kódolás + Ebben a .login_conf példában a változókat BIG-5 kódolású hagyomános @@ -419,11 +442,12 @@ :charset=big5:\ :xmodifiers="@im=gcin": # a gcin beállítása XIM szerverként - A többit ld. a A többit ld. a Rendszergazdai szintû beállítások résznél és a &man.login.conf.5; man oldalon. + @@ -467,15 +491,15 @@ A bejelentkezési osztály megváltoztatása a - &man.vipw.8;-vel + &man.vipw.8; programmal + + vipw - - vipw - - A vipw-et új - felhasználók hozzáadására - használjuk, aminek eredményeképpen - egy ehhez hasonló bejegyzést tudunk + A vipw segédprogramot + új felhasználók + hozzáadására használjuk, + aminek eredményeképpen egy ehhez + hasonló bejegyzést tudunk létrehozni: felhasznalo:jelszo:1111:11:nyelv:0:0:Felhasznalo neve:/home/felhasznalo:/bin/sh @@ -484,11 +508,10 @@ osztály megváltoztatása az &man.adduser.8;-rel - - adduser - + adduser bejelentkezési osztály + Az adduser-rel az alábbiak szerint tudunk új felhasználókat felvenni a rendszerbe: @@ -509,9 +532,10 @@ Egy másik megoldás lehet, hogy a &man.adduser.8; használata során minden felhasználó esetén - külön megadjuk a nyelvet az -Enter login class: default []: - rész megjelenésekor. + külön megadjuk a nyelvet az + + Enter login class: default []: + rész megjelenésekor. @@ -527,46 +551,47 @@ A bejelentkezési osztály megváltoztatása a &man.pw.8;-vel - - pw - + + pw + Amennyiben a &man.pw.8;-t használjuk új felhasználók hozzáadására, így érdemes meghívnunk: - &prompt.root; pw useradd felhasznalo_neve -L nyelv + &prompt.root; pw useradd felhasználó_neve -L nyelv + - Beállítás a shell - indító állományával + Beállítás a + parancsértelmezõ indító + állományával Ezt a módszert nem javasoljuk, mivel - shellenként eltérõ - beállítást kíván. - Használjuk helyette a bejelentkezési osztályokkal megvalósított módszert. MIME - - nyelvi - beállítás - + nyelvi + beállítás + A nyelvi beállítás nevének és a MIME karakterkészlet beállításához egyszerûen csak adjuk meg a lenti /etc/profile - és/vagy /etc/csh.login shell - indító állományokban bemutatott - környezeti változót. Továbbra is - a német nyelvet használjuk a - példánkban: + és/vagy /etc/csh.login + parancsértelmezõ indító + állományokban bemutatott környezeti + változót. Továbbra is a német + nyelvet használjuk a példánkban: Az /etc/profile esetén: @@ -602,8 +627,9 @@ setenv LANG de_DE.ISO8859-1 - Attól függõen, milyen shellt - használunk (ld. fentebb). + Attól függõen, milyen + parancsértelmezõt használunk (ld. + fentebb). @@ -630,11 +656,10 @@ állományok nevébõl adható meg. - - sysinstall - + sysinstall billentyûkiosztás betûkiosztás + Mindezek mellett állítsuk be a megfelelõ billentyû- és betûkiosztást is a sysinstall (vagy @@ -649,7 +674,7 @@ /etc/rc.conf állományba: - scrnmap=betûkiosztás_neve + scrnmap=betûkiosztás_neve keymap=billentyûkiosztás_neve keychange="funkcióbillentyû_sorszáma szekvencia" @@ -674,15 +699,14 @@ /etc/rc.conf állományban az alábbi sor megadásával: -moused_enable="YES" + moused_enable="YES" akkor a következõ bekezdésben rá is térhetünk az egérmutató adatainak vizsgálatára. - - moused - + moused + A &man.syscons.4; meghajtóban található egérmutató alapértelmezés szerint a 0xd0 - 0xd3 karaktereket foglalja el a @@ -770,9 +794,10 @@ - A széles és több byte-os karaktereket - használó nyelvek esetén használjuk a - /usr/portsnyelv + A széles és több bájtos + karaktereket használó nyelvek esetén + használjuk a + /usr/ports/nyelv könyvtárban megfelelõ &os; portot. Egyes portok konzolosként jelennek meg, miközben a rendszer soros virtuális terminálként @@ -833,16 +858,16 @@ Az ~/.Xresources állományban további I18N beállításokat finomíthatunk - alkalmazásonként (pl. betûtípusok, + alkalmazásonként (pl. betûtípusok, menük stb.). Betûtípusok megjelenítése - - X11 True Type betûtípus - szerver - + + X11 True Type betûtípus + szerver + Telepítsük fel az &xorg; (x11-servers/xorg-server) vagy az @@ -855,11 +880,14 @@ révén már látni fogjuk a kiválasztott nyelven megjelenõ menüket és egyéb szövegeket. + Idegennyelvû karakterek bevitele + X11 Input Method (XIM) + Az X11 beviteli módszerének (X11 Input Method, XIM) protokollja egy új szabvány az összes X11 klienshez. Minden X11 alkalmazást @@ -869,6 +897,7 @@ Különbözõ XIM szerverek érhetõek el az eltérõ nyelvekhez. + @@ -878,7 +907,7 @@ Egyes egyszerû karakteres készletek általában hardveresen beépítve megtalálhatóak a nyomtatókban. A - széles és több byte-os + széles és több bájtos karakterkészletek azonban külön beállítást igényelnek, amire az apsfilter használatát @@ -886,6 +915,7 @@ eszközökkel át is lehet konvertálni &postscript; vagy PDF formátumba a nyomtatni kívánt dokumentumot. + @@ -901,28 +931,31 @@ állományrendszerben. Emiatt a neveket nyersen kezeli, semmit sem tud a kódolásukról. Az FFS hivatalosan még nem támogat semmilyen fajta - széles vagy több byte-os karakterkészletet. - Azonban léteznek független javítások - az FFS-hez, amelyek lehetõvé teszik ilyen - széles vagy több byte-os karakterek - használatát. Ezek csak átmeneti és - nem hordozható megoldások, olyan - módosítások, amelyekrõl úgy - döntöttünk, nem vesszük fel õket a - forrásfába. Az érintett nyelvek honlapjain - elérhetjük ezeket a javításokat - és többet megtudhatunk róluk. + széles vagy több bájtos + karakterkészletet. Azonban léteznek + független javítások az FFS-hez, amelyek + lehetõvé teszik ilyen széles vagy több + bájtos karakterek használatát. Ezek csak + átmeneti és nem hordozható + megoldások, olyan módosítások, + amelyekrõl úgy döntöttünk, nem + vesszük fel õket a forrásfába. Az + érintett nyelvek honlapjain elérhetjük ezeket + a javításokat és többet megtudhatunk + róluk. DOS Unicode + A &os; &ms-dos; állományrendszere - konfigurálható úgy, hogy képes legyen - konvertálni az &ms-dos; Unicode és a + konfigurálható úgy, hogy képes + legyen konvertálni az &ms-dos; Unicode és a kiválasztott &os; állományrendszerének karakterkészlete között. Errõl bõvebben a &man.mount.msdosfs.8; man oldalon olvashatunk. + @@ -937,9 +970,8 @@ igényelnek külön beállításokat. - - MySQL - + MySQL + Azonban néhány alkalmazás, mint például a MySQL, esetén az adott karakterkészletnek megfelelõ @@ -948,6 +980,7 @@ magában a Makefile-ban tudjuk megtenni, vagy pedig a configure megfelelõ paraméterezésével. + @@ -963,7 +996,9 @@ + Az orosz nyelv (KOI8-R kódolás) + honosítás orosz @@ -986,11 +1021,12 @@ :charset=KOI8-R:\ :lang=ru_RU.KOI8-R: - Valamint ld. a fejezet korábbi részeiben + Valamint ld. a fejezet korábbi részeiben említett példákat a nyelvi beállítások megadására. + @@ -1029,15 +1065,18 @@ Valamint ld. a fejezet korábbi - részében bemutatott példákat a konzol + részében bemutatott példákat a + konzol beállítására. + A nyomtatás beállítása + nyomtatók + Mivel a legtöbb nyomtató hardveresen tartalmazza a CP866 kódlapot az orosz karakterek támogatásához, használnunk kell @@ -1059,6 +1098,7 @@ A bõvebben magyarázathoz ld. a &man.printcap.5; man oldalt. + @@ -1089,6 +1129,7 @@ könyvtárban találhatóak meg! A részleteket a &man.mount.msdosfs.8; man oldalon találhatjuk meg. + @@ -1103,9 +1144,9 @@ Ha &xorg;-ot - használunk, telepítsük a x11-fonts/xorg-fonts-cyrillic - csomagot. + használunk, telepítsük a x11-fonts/xorg-fonts-cyrillic + csomagot. Ellenõrizzük a /etc/X11/xorg.conf @@ -1127,7 +1168,8 @@ A portok között találhatunk még további cirill - betûtípusokat. + betûtípusokat. + @@ -1145,9 +1187,9 @@ kommentezve) ebben a szakaszban. A grp:caps_toggle - beállítás esetén az orosz/latin - (RUS/LAT) átkapcsolás gombja a jobb - Alt lesz, míg a + beállítás esetén az + orosz/latin (RUS/LAT) átkapcsolás gombja a + jobb Alt lesz, míg a grp:ctrl_shift_toggle beállításnál a CtrlShift. @@ -1184,6 +1226,7 @@ XtSetLanuageProc(NULL, NULL, NULL); függvényt valahol a program elején. + Az X11 alkalmazások honosításához további útmutatásokat a + Hagyományos kínai honosítás tajvaniak számára + honosítás hagyományos kínai + A &os;-Taiwan projekt készített a &os;-hez egy kínainak szóló hogyant, amely elérhetõ a statue@freebsd.sinica.edu.tw). Chuan-Hsing Shen - (statue@freebsd.sinica.edu.tw) létrehozta a - + (statue@freebsd.sinica.edu.tw) létrehozta + a Kínai &os; gyûjteményt (Chinese &os; Collection, CFC) a &os;-Taiwan zh-L10N-tut munkáját @@ -1220,6 +1266,7 @@ és szkriptek elérhetõek a címen. + @@ -1238,11 +1285,13 @@ németül készült és a címen érhetõ el. + Honosítás japán és koreai nyelvekre + honosítás japán @@ -1251,22 +1300,24 @@ honosítás koreai - A japán honosításhoz ld. , és a koreaihoz - pedig ld. . + + A japán honosításhoz ld. , a koreaihoz pedig ld. + . + Idegennyelvû &os; dokumentáció - Néhány &os; résztvevõ + Néhány &os; felhasználó lefordította a &os; egyes részeit más nyelvekre is. Munkájuk elérhetõ a fõoldalon található linkeken keresztül vagy a /usr/share/doc könyvtárban. + From owner-p4-projects@FreeBSD.ORG Wed Apr 2 18:54:02 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A6EB71065674; Wed, 2 Apr 2008 18:54:02 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5C0411065671 for ; Wed, 2 Apr 2008 18:54:02 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4510E8FC19 for ; Wed, 2 Apr 2008 18:53:57 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m32IrvpB048963 for ; Wed, 2 Apr 2008 18:53:57 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m32IrtZB048961 for perforce@freebsd.org; Wed, 2 Apr 2008 18:53:55 GMT (envelope-from rpaulo@FreeBSD.org) Date: Wed, 2 Apr 2008 18:53:55 GMT Message-Id: <200804021853.m32IrtZB048961@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 139233 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Apr 2008 18:54:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=139233 Change 139233 by rpaulo@rpaulo_epsilon on 2008/04/02 18:53:48 IFC Affected files ... .. //depot/projects/tcpecn/amd64/acpica/acpi_machdep.c#2 integrate .. //depot/projects/tcpecn/amd64/acpica/madt.c#3 integrate .. //depot/projects/tcpecn/amd64/amd64/amd64_mem.c#2 integrate .. //depot/projects/tcpecn/amd64/amd64/cpu_switch.S#2 integrate .. //depot/projects/tcpecn/amd64/amd64/genassym.c#2 integrate .. //depot/projects/tcpecn/amd64/amd64/intr_machdep.c#2 integrate .. //depot/projects/tcpecn/amd64/amd64/legacy.c#2 integrate .. //depot/projects/tcpecn/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/tcpecn/amd64/amd64/machdep.c#3 integrate .. //depot/projects/tcpecn/amd64/amd64/mem.c#2 integrate .. //depot/projects/tcpecn/amd64/amd64/mp_machdep.c#3 integrate .. //depot/projects/tcpecn/amd64/amd64/mptable.c#2 integrate .. //depot/projects/tcpecn/amd64/amd64/nexus.c#2 integrate .. //depot/projects/tcpecn/amd64/amd64/pmap.c#6 integrate .. //depot/projects/tcpecn/amd64/amd64/prof_machdep.c#3 integrate .. //depot/projects/tcpecn/amd64/amd64/trap.c#3 integrate .. //depot/projects/tcpecn/amd64/amd64/vm_machdep.c#2 integrate .. //depot/projects/tcpecn/amd64/conf/DEFAULTS#2 integrate .. //depot/projects/tcpecn/amd64/conf/GENERIC#6 integrate .. //depot/projects/tcpecn/amd64/conf/NOTES#5 integrate .. //depot/projects/tcpecn/amd64/ia32/ia32_signal.c#2 integrate .. //depot/projects/tcpecn/amd64/include/atomic.h#2 integrate .. //depot/projects/tcpecn/amd64/include/clock.h#2 integrate .. //depot/projects/tcpecn/amd64/include/intr_machdep.h#2 integrate .. //depot/projects/tcpecn/amd64/include/nexusvar.h#1 branch .. //depot/projects/tcpecn/amd64/include/param.h#2 integrate .. //depot/projects/tcpecn/amd64/include/pcb.h#2 integrate .. //depot/projects/tcpecn/amd64/include/pmap.h#3 integrate .. //depot/projects/tcpecn/amd64/include/specialreg.h#4 integrate .. //depot/projects/tcpecn/amd64/include/timerreg.h#2 integrate .. //depot/projects/tcpecn/amd64/isa/atpic.c#2 integrate .. //depot/projects/tcpecn/amd64/isa/clock.c#3 integrate .. //depot/projects/tcpecn/amd64/linux32/linux32_proto.h#2 integrate .. //depot/projects/tcpecn/amd64/linux32/linux32_syscall.h#2 integrate .. //depot/projects/tcpecn/amd64/linux32/linux32_sysent.c#2 integrate .. //depot/projects/tcpecn/amd64/linux32/linux32_sysvec.c#2 integrate .. //depot/projects/tcpecn/amd64/linux32/syscalls.master#2 integrate .. //depot/projects/tcpecn/arm/arm/busdma_machdep.c#3 integrate .. //depot/projects/tcpecn/arm/arm/elf_trampoline.c#2 integrate .. //depot/projects/tcpecn/arm/arm/intr.c#2 integrate .. //depot/projects/tcpecn/arm/arm/machdep.c#2 integrate .. //depot/projects/tcpecn/arm/arm/nexus.c#2 integrate .. //depot/projects/tcpecn/arm/arm/pmap.c#6 integrate .. //depot/projects/tcpecn/arm/arm/trap.c#2 integrate .. //depot/projects/tcpecn/arm/arm/uio_machdep.c#2 integrate .. //depot/projects/tcpecn/arm/arm/vm_machdep.c#2 integrate .. //depot/projects/tcpecn/arm/conf/AVILA#3 integrate .. //depot/projects/tcpecn/arm/conf/AVILA.hints#2 integrate .. //depot/projects/tcpecn/arm/conf/BWCT#3 integrate .. //depot/projects/tcpecn/arm/conf/CRB#3 integrate .. //depot/projects/tcpecn/arm/conf/EP80219#3 integrate .. //depot/projects/tcpecn/arm/conf/HL200#3 integrate .. //depot/projects/tcpecn/arm/conf/IQ31244#3 integrate .. //depot/projects/tcpecn/arm/conf/KB920X#3 integrate .. //depot/projects/tcpecn/arm/conf/SIMICS#3 integrate .. //depot/projects/tcpecn/arm/conf/SKYEYE#3 integrate .. //depot/projects/tcpecn/arm/include/param.h#2 integrate .. //depot/projects/tcpecn/arm/include/pmap.h#3 integrate .. //depot/projects/tcpecn/arm/xscale/i8134x/crb_machdep.c#2 integrate .. //depot/projects/tcpecn/arm/xscale/ixp425/if_npe.c#3 integrate .. //depot/projects/tcpecn/arm/xscale/ixp425/ixdp425_pci.c#2 integrate .. //depot/projects/tcpecn/boot/common/dev_net.c#2 integrate .. //depot/projects/tcpecn/boot/forth/loader.conf#2 integrate .. //depot/projects/tcpecn/boot/i386/btx/btx/btx.S#3 integrate .. //depot/projects/tcpecn/boot/i386/cdboot/cdboot.s#2 integrate .. //depot/projects/tcpecn/boot/i386/pxeldr/pxeldr.S#2 integrate .. //depot/projects/tcpecn/boot/pc98/cdboot/cdboot.s#2 integrate .. //depot/projects/tcpecn/boot/powerpc/uboot/metadata.c#3 integrate .. //depot/projects/tcpecn/boot/uboot/Makefile#2 integrate .. //depot/projects/tcpecn/boot/uboot/common/main.c#3 integrate .. //depot/projects/tcpecn/boot/uboot/lib/Makefile#3 integrate .. //depot/projects/tcpecn/boot/uboot/lib/api_public.h#3 integrate .. //depot/projects/tcpecn/boot/uboot/lib/console.c#2 integrate .. //depot/projects/tcpecn/boot/uboot/lib/copy.c#2 integrate .. //depot/projects/tcpecn/boot/uboot/lib/devicename.c#2 integrate .. //depot/projects/tcpecn/boot/uboot/lib/disk.c#2 integrate .. //depot/projects/tcpecn/boot/uboot/lib/elf_freebsd.c#2 integrate .. //depot/projects/tcpecn/boot/uboot/lib/glue.c#3 integrate .. //depot/projects/tcpecn/boot/uboot/lib/glue.h#2 integrate .. //depot/projects/tcpecn/boot/uboot/lib/libuboot.h#2 integrate .. //depot/projects/tcpecn/boot/uboot/lib/module.c#2 integrate .. //depot/projects/tcpecn/boot/uboot/lib/net.c#2 integrate .. //depot/projects/tcpecn/boot/uboot/lib/reboot.c#2 integrate .. //depot/projects/tcpecn/boot/uboot/lib/time.c#2 integrate .. //depot/projects/tcpecn/cam/scsi/scsi_ses.c#3 integrate .. //depot/projects/tcpecn/cddl/compat/opensolaris/kern/opensolaris_atomic.c#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/kern/opensolaris_kmem.c#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/kern/opensolaris_kobj.c#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/kern/opensolaris_kstat.c#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/kern/opensolaris_misc.c#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/kern/opensolaris_policy.c#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/kern/opensolaris_string.c#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/kern/opensolaris_vfs.c#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/kern/opensolaris_zone.c#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/machine/endian.h#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/rpc/xdr.h#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/acl.h#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/atomic.h#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/bitmap.h#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/byteorder.h#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/callb.h#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/cmn_err.h#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/cpupart.h#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/cpuvar.h#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/cred.h#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/cyclic.h#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/debug.h#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/dirent.h#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/dkio.h#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/dnlc.h#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/elf.h#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/kcondvar.h#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/kmem.h#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/kobj.h#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/kstat.h#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/lock.h#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/misc.h#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/mman.h#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/mntent.h#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/mnttab.h#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/modctl.h#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/mount.h#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/mutex.h#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/objfs.h#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/param.h#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/pcpu.h#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/policy.h#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/proc.h#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/random.h#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/rwlock.h#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/sdt.h#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/stat.h#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/string.h#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/sunddi.h#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/sysmacros.h#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/systm.h#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/taskq.h#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/taskq_impl.h#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/time.h#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/types.h#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/uio.h#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/varargs.h#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/vfs.h#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/vnode.h#1 branch .. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/zone.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/common/acl/acl_common.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/common/acl/acl_common.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/common/atomic/i386/atomic.S#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/common/atomic/ia64/atomic.S#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/common/avl/avl.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/common/nvpair/nvpair.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/common/zfs/zfs_prop.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/Makefile.files#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/gfs.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/bplist.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/gzip.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/sha256.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/unique.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/os/callb.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/os/list.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/os/taskq.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/rpc/xdr.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/rpc/xdr_array.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/rpc/xdr_mem.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/sys/asm_linkage.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/sys/avl.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/sys/avl_impl.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/sys/bitmap.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/sys/byteorder.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/sys/callb.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/sys/ccompile.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/sys/compress.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/sys/cred.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/sys/debug.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/sys/dkio.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/sys/dklabel.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/sys/errorq.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/sys/feature_tests.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/sys/fm/protocol.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/sys/fm/util.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/sys/gfs.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/sys/list.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/sys/list_impl.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/sys/note.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/sys/nvpair.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/sys/nvpair_impl.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/sys/processor.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/sys/procset.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/sys/sdt.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/sys/synch.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/sys/sysevent.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/sys/vmem.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/sys/zmod.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/zmod/adler32.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/zmod/crc32.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/zmod/crc32.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/zmod/deflate.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/zmod/deflate.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/zmod/inffast.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/zmod/inffast.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/zmod/inffixed.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/zmod/inflate.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/zmod/inflate.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/zmod/inftrees.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/zmod/inftrees.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/zmod/trees.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/zmod/zconf.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/zmod/zlib.h#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/zmod/zmod.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/zmod/zmod_subr.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/zmod/zutil.c#1 branch .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/zmod/zutil.h#1 branch .. //depot/projects/tcpecn/compat/freebsd32/freebsd32_misc.c#3 integrate .. //depot/projects/tcpecn/compat/freebsd32/freebsd32_proto.h#6 integrate .. //depot/projects/tcpecn/compat/freebsd32/freebsd32_syscall.h#6 integrate .. //depot/projects/tcpecn/compat/freebsd32/freebsd32_syscalls.c#6 integrate .. //depot/projects/tcpecn/compat/freebsd32/freebsd32_sysent.c#6 integrate .. //depot/projects/tcpecn/compat/freebsd32/syscalls.master#6 integrate .. //depot/projects/tcpecn/compat/linprocfs/linprocfs.c#4 integrate .. //depot/projects/tcpecn/compat/linux/linux_file.c#4 integrate .. //depot/projects/tcpecn/compat/linux/linux_futex.c#3 integrate .. //depot/projects/tcpecn/compat/linux/linux_futex.h#2 integrate .. //depot/projects/tcpecn/compat/linux/linux_misc.c#4 integrate .. //depot/projects/tcpecn/compat/linux/linux_uid16.c#2 integrate .. //depot/projects/tcpecn/compat/linux/linux_util.c#2 integrate .. //depot/projects/tcpecn/compat/opensolaris/kern/opensolaris_atomic.c#2 delete .. //depot/projects/tcpecn/compat/opensolaris/kern/opensolaris_kmem.c#3 delete .. //depot/projects/tcpecn/compat/opensolaris/kern/opensolaris_kobj.c#3 delete .. //depot/projects/tcpecn/compat/opensolaris/kern/opensolaris_kstat.c#2 delete .. //depot/projects/tcpecn/compat/opensolaris/kern/opensolaris_misc.c#2 delete .. //depot/projects/tcpecn/compat/opensolaris/kern/opensolaris_policy.c#2 delete .. //depot/projects/tcpecn/compat/opensolaris/kern/opensolaris_string.c#2 delete .. //depot/projects/tcpecn/compat/opensolaris/kern/opensolaris_vfs.c#3 delete .. //depot/projects/tcpecn/compat/opensolaris/kern/opensolaris_zone.c#2 delete .. //depot/projects/tcpecn/compat/opensolaris/machine/endian.h#2 delete .. //depot/projects/tcpecn/compat/opensolaris/rpc/xdr.h#3 delete .. //depot/projects/tcpecn/compat/opensolaris/sys/acl.h#2 delete .. //depot/projects/tcpecn/compat/opensolaris/sys/atomic.h#3 delete .. //depot/projects/tcpecn/compat/opensolaris/sys/bitmap.h#2 delete .. //depot/projects/tcpecn/compat/opensolaris/sys/byteorder.h#2 delete .. //depot/projects/tcpecn/compat/opensolaris/sys/callb.h#2 delete .. //depot/projects/tcpecn/compat/opensolaris/sys/cmn_err.h#2 delete .. //depot/projects/tcpecn/compat/opensolaris/sys/cpupart.h#2 delete .. //depot/projects/tcpecn/compat/opensolaris/sys/cpuvar.h#2 delete .. //depot/projects/tcpecn/compat/opensolaris/sys/cred.h#2 delete .. //depot/projects/tcpecn/compat/opensolaris/sys/cyclic.h#2 delete .. //depot/projects/tcpecn/compat/opensolaris/sys/debug.h#2 delete .. //depot/projects/tcpecn/compat/opensolaris/sys/dirent.h#2 delete .. //depot/projects/tcpecn/compat/opensolaris/sys/dkio.h#2 delete .. //depot/projects/tcpecn/compat/opensolaris/sys/dnlc.h#2 delete .. //depot/projects/tcpecn/compat/opensolaris/sys/elf.h#2 delete .. //depot/projects/tcpecn/compat/opensolaris/sys/kcondvar.h#2 delete .. //depot/projects/tcpecn/compat/opensolaris/sys/kmem.h#4 delete .. //depot/projects/tcpecn/compat/opensolaris/sys/kobj.h#2 delete .. //depot/projects/tcpecn/compat/opensolaris/sys/kstat.h#2 delete .. //depot/projects/tcpecn/compat/opensolaris/sys/lock.h#2 delete .. //depot/projects/tcpecn/compat/opensolaris/sys/misc.h#2 delete .. //depot/projects/tcpecn/compat/opensolaris/sys/mman.h#2 delete .. //depot/projects/tcpecn/compat/opensolaris/sys/mntent.h#2 delete .. //depot/projects/tcpecn/compat/opensolaris/sys/mnttab.h#2 delete .. //depot/projects/tcpecn/compat/opensolaris/sys/modctl.h#2 delete .. //depot/projects/tcpecn/compat/opensolaris/sys/mount.h#2 delete .. //depot/projects/tcpecn/compat/opensolaris/sys/mutex.h#2 delete .. //depot/projects/tcpecn/compat/opensolaris/sys/objfs.h#2 delete .. //depot/projects/tcpecn/compat/opensolaris/sys/param.h#2 delete .. //depot/projects/tcpecn/compat/opensolaris/sys/pcpu.h#2 delete .. //depot/projects/tcpecn/compat/opensolaris/sys/policy.h#2 delete .. //depot/projects/tcpecn/compat/opensolaris/sys/proc.h#3 delete .. //depot/projects/tcpecn/compat/opensolaris/sys/random.h#2 delete .. //depot/projects/tcpecn/compat/opensolaris/sys/rwlock.h#2 delete .. //depot/projects/tcpecn/compat/opensolaris/sys/sdt.h#2 delete .. //depot/projects/tcpecn/compat/opensolaris/sys/stat.h#2 delete .. //depot/projects/tcpecn/compat/opensolaris/sys/string.h#2 delete .. //depot/projects/tcpecn/compat/opensolaris/sys/sunddi.h#2 delete .. //depot/projects/tcpecn/compat/opensolaris/sys/sysmacros.h#2 delete .. //depot/projects/tcpecn/compat/opensolaris/sys/systm.h#2 delete .. //depot/projects/tcpecn/compat/opensolaris/sys/taskq.h#2 delete .. //depot/projects/tcpecn/compat/opensolaris/sys/taskq_impl.h#2 delete .. //depot/projects/tcpecn/compat/opensolaris/sys/time.h#3 delete .. //depot/projects/tcpecn/compat/opensolaris/sys/types.h#3 delete .. //depot/projects/tcpecn/compat/opensolaris/sys/uio.h#2 delete .. //depot/projects/tcpecn/compat/opensolaris/sys/varargs.h#2 delete .. //depot/projects/tcpecn/compat/opensolaris/sys/vfs.h#2 delete .. //depot/projects/tcpecn/compat/opensolaris/sys/vnode.h#3 delete .. //depot/projects/tcpecn/compat/opensolaris/sys/zone.h#2 delete .. //depot/projects/tcpecn/compat/pecoff/imgact_pecoff.c#3 integrate .. //depot/projects/tcpecn/compat/svr4/svr4_fcntl.c#3 integrate .. //depot/projects/tcpecn/compat/svr4/svr4_sysvec.c#2 integrate .. //depot/projects/tcpecn/conf/NOTES#7 integrate .. //depot/projects/tcpecn/conf/files#7 integrate .. //depot/projects/tcpecn/conf/files.powerpc#5 integrate .. //depot/projects/tcpecn/conf/kmod.mk#2 integrate .. //depot/projects/tcpecn/conf/options#7 integrate .. //depot/projects/tcpecn/conf/options.amd64#3 integrate .. //depot/projects/tcpecn/conf/options.i386#3 integrate .. //depot/projects/tcpecn/conf/options.pc98#2 integrate .. //depot/projects/tcpecn/conf/options.powerpc#4 integrate .. //depot/projects/tcpecn/contrib/opensolaris/OPENSOLARIS.LICENSE#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/common/acl/acl_common.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/common/acl/acl_common.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/common/atomic/amd64/atomic.S#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/common/atomic/i386/atomic.S#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/common/atomic/ia64/atomic.S#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/common/avl/avl.c#3 delete .. //depot/projects/tcpecn/contrib/opensolaris/common/nvpair/nvpair.c#3 delete .. //depot/projects/tcpecn/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/common/zfs/zfs_namecheck.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/common/zfs/zfs_namecheck.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/common/zfs/zfs_prop.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/common/zfs/zfs_prop.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/Makefile.files#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/gfs.c#3 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/arc.c#4 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/bplist.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/dmu.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/dnode.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/gzip.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/refcount.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/sha256.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/spa.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/space_map.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#3 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/txg.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/unique.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/vdev.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#3 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#3 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/zap.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#3 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#3 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#3 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#4 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/zil.c#3 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/zio.c#3 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/fs/zfs/zvol.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/os/callb.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/os/list.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/os/taskq.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/rpc/xdr.c#3 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/rpc/xdr.h#3 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/rpc/xdr_array.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/rpc/xdr_mem.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/sys/asm_linkage.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/sys/avl.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/sys/avl_impl.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/sys/bitmap.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/sys/byteorder.h#3 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/sys/callb.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/sys/ccompile.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/sys/compress.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/sys/cred.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/sys/debug.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/sys/dkio.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/sys/dklabel.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/sys/errorq.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/sys/feature_tests.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/sys/fm/protocol.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/sys/fm/util.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/sys/fs/zfs.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/sys/gfs.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/sys/isa_defs.h#3 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/sys/list.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/sys/list_impl.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/sys/note.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/sys/nvpair.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/sys/nvpair_impl.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/sys/processor.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/sys/procset.h#3 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/sys/sdt.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/sys/synch.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/sys/sysevent.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/sys/sysmacros.h#3 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/sys/vmem.h#3 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/sys/zmod.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/zmod/adler32.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/zmod/crc32.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/zmod/crc32.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/zmod/deflate.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/zmod/deflate.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/zmod/inffast.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/zmod/inffast.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/zmod/inffixed.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/zmod/inflate.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/zmod/inflate.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/zmod/inftrees.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/zmod/inftrees.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/zmod/trees.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/zmod/zconf.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/zmod/zlib.h#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/zmod/zmod.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/zmod/zmod_subr.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/zmod/zutil.c#2 delete .. //depot/projects/tcpecn/contrib/opensolaris/uts/common/zmod/zutil.h#2 delete .. //depot/projects/tcpecn/contrib/pf/net/pf_if.c#2 integrate .. //depot/projects/tcpecn/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/tcpecn/contrib/pf/net/pfvar.h#2 integrate .. //depot/projects/tcpecn/ddb/db_command.c#3 integrate .. //depot/projects/tcpecn/ddb/db_examine.c#2 integrate .. //depot/projects/tcpecn/ddb/db_input.c#3 integrate .. //depot/projects/tcpecn/ddb/db_ps.c#2 integrate .. //depot/projects/tcpecn/ddb/ddb.h#3 integrate .. //depot/projects/tcpecn/dev/aac/aac.c#3 integrate .. //depot/projects/tcpecn/dev/aac/aac_cam.c#3 integrate .. //depot/projects/tcpecn/dev/aac/aac_debug.c#3 integrate .. //depot/projects/tcpecn/dev/aac/aac_disk.c#2 integrate .. //depot/projects/tcpecn/dev/aac/aac_pci.c#3 integrate .. //depot/projects/tcpecn/dev/aac/aacreg.h#3 integrate .. //depot/projects/tcpecn/dev/aac/aacvar.h#3 integrate .. //depot/projects/tcpecn/dev/acpica/acpi.c#3 integrate .. //depot/projects/tcpecn/dev/acpica/acpi_cpu.c#3 integrate .. //depot/projects/tcpecn/dev/acpica/acpivar.h#2 integrate .. //depot/projects/tcpecn/dev/agp/agp_i810.c#3 integrate .. //depot/projects/tcpecn/dev/agp/agp_nvidia.c#2 integrate .. //depot/projects/tcpecn/dev/ata/ata-all.c#2 integrate .. //depot/projects/tcpecn/dev/ata/ata-all.h#4 integrate .. //depot/projects/tcpecn/dev/ata/ata-chipset.c#4 integrate .. //depot/projects/tcpecn/dev/ata/ata-disk.c#3 integrate .. //depot/projects/tcpecn/dev/ata/ata-disk.h#2 integrate .. //depot/projects/tcpecn/dev/ata/ata-pci.h#2 integrate .. //depot/projects/tcpecn/dev/ata/ata-raid.c#2 integrate .. //depot/projects/tcpecn/dev/ath/if_ath.c#3 integrate .. //depot/projects/tcpecn/dev/bge/if_bge.c#4 integrate .. //depot/projects/tcpecn/dev/bge/if_bgereg.h#4 integrate .. //depot/projects/tcpecn/dev/cmx/cmx.c#1 branch .. //depot/projects/tcpecn/dev/cmx/cmx_pccard.c#1 branch .. //depot/projects/tcpecn/dev/cmx/cmxreg.h#1 branch .. //depot/projects/tcpecn/dev/cmx/cmxvar.h#1 branch .. //depot/projects/tcpecn/dev/cpufreq/ichss.c#2 integrate .. //depot/projects/tcpecn/dev/cxgb/common/cxgb_ael1002.c#3 integrate .. //depot/projects/tcpecn/dev/cxgb/common/cxgb_common.h#3 integrate .. //depot/projects/tcpecn/dev/cxgb/common/cxgb_version.h#3 integrate .. //depot/projects/tcpecn/dev/cxgb/cxgb_adapter.h#5 integrate .. //depot/projects/tcpecn/dev/cxgb/cxgb_ioctl.h#3 integrate .. //depot/projects/tcpecn/dev/cxgb/cxgb_main.c#5 integrate .. //depot/projects/tcpecn/dev/cxgb/cxgb_offload.h#3 integrate .. //depot/projects/tcpecn/dev/cxgb/cxgb_sge.c#6 integrate .. //depot/projects/tcpecn/dev/cxgb/sys/cxgb_support.c#4 integrate .. //depot/projects/tcpecn/dev/cxgb/ulp/tom/cxgb_cpl_io.c#3 integrate .. //depot/projects/tcpecn/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#4 integrate .. //depot/projects/tcpecn/dev/cxgb/ulp/tom/cxgb_ddp.c#2 integrate .. //depot/projects/tcpecn/dev/cxgb/ulp/tom/cxgb_defs.h#3 integrate .. //depot/projects/tcpecn/dev/dc/if_dc.c#2 integrate .. //depot/projects/tcpecn/dev/dc/if_dcreg.h#2 integrate .. //depot/projects/tcpecn/dev/drm/drm_pciids.h#3 integrate .. //depot/projects/tcpecn/dev/drm/i915_dma.c#2 integrate .. //depot/projects/tcpecn/dev/en/midway.c#2 integrate .. //depot/projects/tcpecn/dev/fatm/if_fatm.c#2 integrate .. //depot/projects/tcpecn/dev/firewire/if_fwe.c#2 integrate .. //depot/projects/tcpecn/dev/firewire/if_fwip.c#2 integrate .. //depot/projects/tcpecn/dev/fxp/if_fxp.c#2 integrate .. //depot/projects/tcpecn/dev/gem/if_gem.c#4 integrate .. //depot/projects/tcpecn/dev/gem/if_gem_pci.c#3 integrate .. //depot/projects/tcpecn/dev/gem/if_gemreg.h#3 integrate .. //depot/projects/tcpecn/dev/gem/if_gemvar.h#3 integrate .. //depot/projects/tcpecn/dev/hptrr/hptrr_os_bsd.c#3 integrate .. //depot/projects/tcpecn/dev/hptrr/hptrr_osm_bsd.c#4 integrate .. //depot/projects/tcpecn/dev/hptrr/ldm.h#3 integrate .. //depot/projects/tcpecn/dev/hptrr/osm.h#3 integrate .. //depot/projects/tcpecn/dev/hwpmc/hwpmc_amd.c#3 integrate .. //depot/projects/tcpecn/dev/hwpmc/pmc_events.h#2 integrate .. //depot/projects/tcpecn/dev/ic/quicc.h#1 branch .. //depot/projects/tcpecn/dev/iscsi/initiator/isc_soc.c#3 integrate .. //depot/projects/tcpecn/dev/lge/if_lge.c#3 integrate .. //depot/projects/tcpecn/dev/malo/if_malo.c#1 branch .. //depot/projects/tcpecn/dev/malo/if_malo.h#1 branch .. //depot/projects/tcpecn/dev/malo/if_malo_pci.c#1 branch .. //depot/projects/tcpecn/dev/malo/if_malohal.c#1 branch .. //depot/projects/tcpecn/dev/malo/if_malohal.h#1 branch .. //depot/projects/tcpecn/dev/malo/if_maloioctl.h#1 branch .. //depot/projects/tcpecn/dev/mfi/mfi.c#4 integrate .. //depot/projects/tcpecn/dev/mii/brgphy.c#3 integrate .. //depot/projects/tcpecn/dev/mii/ciphy.c#2 integrate .. //depot/projects/tcpecn/dev/mii/miidevs#3 integrate .. //depot/projects/tcpecn/dev/mii/rgephy.c#2 integrate .. //depot/projects/tcpecn/dev/mpt/mpt.c#2 integrate .. //depot/projects/tcpecn/dev/msk/if_msk.c#6 integrate .. //depot/projects/tcpecn/dev/mxge/if_mxge.c#4 integrate .. //depot/projects/tcpecn/dev/nfe/if_nfe.c#4 integrate .. //depot/projects/tcpecn/dev/nfe/if_nfereg.h#2 integrate .. //depot/projects/tcpecn/dev/nfe/if_nfevar.h#2 integrate .. //depot/projects/tcpecn/dev/ofw/ofw_console.c#3 integrate .. //depot/projects/tcpecn/dev/pccard/pccarddevs#2 integrate .. //depot/projects/tcpecn/dev/quicc/quicc_bfe.h#1 branch .. //depot/projects/tcpecn/dev/quicc/quicc_bfe_ocp.c#1 branch .. //depot/projects/tcpecn/dev/quicc/quicc_bus.h#1 branch .. //depot/projects/tcpecn/dev/quicc/quicc_core.c#1 branch .. //depot/projects/tcpecn/dev/re/if_re.c#5 integrate .. //depot/projects/tcpecn/dev/scc/scc_bfe.h#2 integrate .. //depot/projects/tcpecn/dev/scc/scc_bfe_quicc.c#1 branch .. //depot/projects/tcpecn/dev/scc/scc_bus.h#2 integrate .. //depot/projects/tcpecn/dev/scc/scc_dev_quicc.c#1 branch .. //depot/projects/tcpecn/dev/speaker/spkr.c#2 integrate .. //depot/projects/tcpecn/dev/syscons/syscons.c#5 integrate .. //depot/projects/tcpecn/dev/syscons/sysmouse.c#2 integrate .. //depot/projects/tcpecn/dev/tdfx/tdfx_pci.c#2 integrate .. //depot/projects/tcpecn/dev/ti/if_ti.c#3 integrate .. //depot/projects/tcpecn/dev/tsec/if_tsec.c#1 branch .. //depot/projects/tcpecn/dev/tsec/if_tsec.h#1 branch .. //depot/projects/tcpecn/dev/tsec/if_tsecreg.h#1 branch .. //depot/projects/tcpecn/dev/uart/uart.h#2 integrate .. //depot/projects/tcpecn/dev/uart/uart_bus_ocp.c#1 branch .. //depot/projects/tcpecn/dev/uart/uart_bus_scc.c#2 integrate .. //depot/projects/tcpecn/dev/uart/uart_cpu_powerpc.c#3 integrate .. //depot/projects/tcpecn/dev/uart/uart_dev_ns8250.c#2 integrate .. //depot/projects/tcpecn/dev/uart/uart_dev_quicc.c#1 branch .. //depot/projects/tcpecn/dev/usb/ehci.c#5 integrate .. //depot/projects/tcpecn/dev/usb/ehci_pci.c#2 integrate .. //depot/projects/tcpecn/dev/usb/if_axe.c#2 integrate .. //depot/projects/tcpecn/dev/usb/if_rum.c#3 integrate .. //depot/projects/tcpecn/dev/usb/if_zyd.c#4 integrate .. //depot/projects/tcpecn/dev/usb/ohci.c#2 integrate .. //depot/projects/tcpecn/dev/usb/ubsa.c#3 integrate .. //depot/projects/tcpecn/dev/usb/ucom.c#3 integrate .. //depot/projects/tcpecn/dev/usb/ucomvar.h#2 integrate .. //depot/projects/tcpecn/dev/usb/ums.c#3 integrate .. //depot/projects/tcpecn/dev/usb/usb_quirks.c#2 integrate .. //depot/projects/tcpecn/dev/usb/usbdevs#6 integrate .. //depot/projects/tcpecn/dev/usb/usbdi.c#3 integrate .. //depot/projects/tcpecn/dev/usb/usbdi.h#2 integrate .. //depot/projects/tcpecn/dev/usb/usbdivar.h#2 integrate .. //depot/projects/tcpecn/dev/usb/uslcom.c#1 branch .. //depot/projects/tcpecn/dev/vr/if_vr.c#1 branch .. //depot/projects/tcpecn/dev/vr/if_vrreg.h#1 branch .. //depot/projects/tcpecn/dev/wpi/if_wpi.c#5 integrate .. //depot/projects/tcpecn/dev/wpi/if_wpireg.h#3 integrate .. //depot/projects/tcpecn/dev/wpi/if_wpivar.h#2 integrate .. //depot/projects/tcpecn/fs/coda/coda_vfsops.c#4 integrate .. //depot/projects/tcpecn/fs/devfs/devfs_rule.c#2 integrate .. //depot/projects/tcpecn/fs/fifofs/fifo_vnops.c#5 integrate .. //depot/projects/tcpecn/fs/msdosfs/msdosfs_vfsops.c#4 integrate .. //depot/projects/tcpecn/fs/msdosfs/msdosfs_vnops.c#3 integrate .. //depot/projects/tcpecn/fs/nullfs/null_subr.c#3 integrate .. //depot/projects/tcpecn/fs/nullfs/null_vfsops.c#5 integrate .. //depot/projects/tcpecn/fs/procfs/procfs_ctl.c#2 integrate .. //depot/projects/tcpecn/fs/procfs/procfs_dbregs.c#2 integrate .. //depot/projects/tcpecn/fs/procfs/procfs_status.c#2 integrate .. //depot/projects/tcpecn/fs/tmpfs/tmpfs_vnops.c#5 integrate .. //depot/projects/tcpecn/fs/unionfs/union_vfsops.c#4 integrate .. //depot/projects/tcpecn/gdb/gdb_cons.c#2 integrate .. //depot/projects/tcpecn/geom/geom.h#2 integrate .. //depot/projects/tcpecn/geom/geom_subr.c#2 integrate .. //depot/projects/tcpecn/geom/part/g_part.c#3 integrate .. //depot/projects/tcpecn/geom/part/g_part.h#3 integrate .. //depot/projects/tcpecn/geom/part/g_part_apm.c#2 integrate .. //depot/projects/tcpecn/geom/part/g_part_bsd.c#2 integrate .. //depot/projects/tcpecn/geom/part/g_part_gpt.c#2 integrate .. //depot/projects/tcpecn/geom/part/g_part_mbr.c#3 integrate .. //depot/projects/tcpecn/geom/part/g_part_pc98.c#1 branch .. //depot/projects/tcpecn/geom/part/g_part_vtoc8.c#2 integrate .. //depot/projects/tcpecn/geom/vinum/geom_vinum_drive.c#2 integrate .. //depot/projects/tcpecn/gnu/fs/ext2fs/ext2_vfsops.c#4 integrate .. //depot/projects/tcpecn/i386/acpica/acpi_machdep.c#2 integrate .. //depot/projects/tcpecn/i386/acpica/acpi_wakeup.c#2 integrate .. //depot/projects/tcpecn/i386/acpica/madt.c#3 integrate .. //depot/projects/tcpecn/i386/conf/DEFAULTS#2 integrate .. //depot/projects/tcpecn/i386/conf/GENERIC#6 integrate .. //depot/projects/tcpecn/i386/conf/NOTES#5 integrate .. //depot/projects/tcpecn/i386/conf/XBOX#3 integrate .. //depot/projects/tcpecn/i386/cpufreq/est.c#3 integrate .. //depot/projects/tcpecn/i386/cpufreq/p4tcc.c#2 integrate .. //depot/projects/tcpecn/i386/i386/busdma_machdep.c#4 integrate .. //depot/projects/tcpecn/i386/i386/i686_mem.c#2 integrate .. //depot/projects/tcpecn/i386/i386/intr_machdep.c#2 integrate .. //depot/projects/tcpecn/i386/i386/k6_mem.c#2 integrate .. //depot/projects/tcpecn/i386/i386/legacy.c#2 integrate .. //depot/projects/tcpecn/i386/i386/local_apic.c#2 integrate .. //depot/projects/tcpecn/i386/i386/machdep.c#4 integrate .. //depot/projects/tcpecn/i386/i386/mp_machdep.c#3 integrate .. //depot/projects/tcpecn/i386/i386/mptable.c#2 integrate .. //depot/projects/tcpecn/i386/i386/nexus.c#2 integrate .. //depot/projects/tcpecn/i386/i386/pmap.c#6 integrate .. //depot/projects/tcpecn/i386/i386/sys_machdep.c#2 integrate .. //depot/projects/tcpecn/i386/i386/trap.c#3 integrate .. //depot/projects/tcpecn/i386/i386/vm_machdep.c#2 integrate .. //depot/projects/tcpecn/i386/ibcs2/ibcs2_fcntl.c#2 integrate .. //depot/projects/tcpecn/i386/ibcs2/ibcs2_util.c#2 integrate .. //depot/projects/tcpecn/i386/ibcs2/imgact_coff.c#3 integrate .. //depot/projects/tcpecn/i386/include/_types.h#2 integrate .. //depot/projects/tcpecn/i386/include/atomic.h#2 integrate .. //depot/projects/tcpecn/i386/include/clock.h#2 integrate .. //depot/projects/tcpecn/i386/include/float.h#2 integrate .. //depot/projects/tcpecn/i386/include/intr_machdep.h#2 integrate .. //depot/projects/tcpecn/i386/include/nexusvar.h#1 branch .. //depot/projects/tcpecn/i386/include/param.h#2 integrate .. //depot/projects/tcpecn/i386/include/pmap.h#4 integrate .. //depot/projects/tcpecn/i386/include/specialreg.h#2 integrate .. //depot/projects/tcpecn/i386/include/timerreg.h#2 integrate .. //depot/projects/tcpecn/i386/include/vmparam.h#3 integrate .. //depot/projects/tcpecn/i386/isa/atpic.c#2 integrate .. //depot/projects/tcpecn/i386/isa/clock.c#3 integrate .. //depot/projects/tcpecn/i386/isa/prof_machdep.c#3 integrate .. //depot/projects/tcpecn/i386/isa/vesa.c#2 integrate .. //depot/projects/tcpecn/i386/linux/linux_proto.h#2 integrate .. //depot/projects/tcpecn/i386/linux/linux_syscall.h#2 integrate .. //depot/projects/tcpecn/i386/linux/linux_sysent.c#2 integrate .. //depot/projects/tcpecn/i386/linux/linux_sysvec.c#2 integrate .. //depot/projects/tcpecn/i386/linux/syscalls.master#2 integrate .. //depot/projects/tcpecn/i386/svr4/svr4_machdep.c#2 integrate .. //depot/projects/tcpecn/i386/xbox/xbox.c#2 integrate .. //depot/projects/tcpecn/ia64/conf/DEFAULTS#3 integrate .. //depot/projects/tcpecn/ia64/conf/GENERIC#5 integrate .. //depot/projects/tcpecn/ia64/ia64/elf_machdep.c#2 integrate .. //depot/projects/tcpecn/ia64/ia64/interrupt.c#2 integrate .. //depot/projects/tcpecn/ia64/ia64/machdep.c#4 integrate .. //depot/projects/tcpecn/ia64/ia64/nexus.c#2 integrate .. //depot/projects/tcpecn/ia64/ia64/pmap.c#4 integrate .. //depot/projects/tcpecn/ia64/ia64/sscdisk.c#2 integrate .. //depot/projects/tcpecn/ia64/ia64/trap.c#2 integrate .. //depot/projects/tcpecn/ia64/include/atomic.h#3 integrate .. //depot/projects/tcpecn/ia64/include/clock.h#2 integrate .. //depot/projects/tcpecn/ia64/include/md_var.h#3 integrate .. //depot/projects/tcpecn/ia64/include/param.h#2 integrate .. //depot/projects/tcpecn/ia64/include/ucontext.h#2 integrate .. //depot/projects/tcpecn/ia64/isa/isa_dma.c#2 integrate .. //depot/projects/tcpecn/isa/syscons_isa.c#2 integrate .. //depot/projects/tcpecn/kern/bus_if.m#2 integrate .. //depot/projects/tcpecn/kern/imgact_elf.c#5 integrate .. //depot/projects/tcpecn/kern/init_main.c#5 integrate .. //depot/projects/tcpecn/kern/init_sysent.c#6 integrate .. //depot/projects/tcpecn/kern/kern_alq.c#3 integrate .. //depot/projects/tcpecn/kern/kern_clock.c#4 integrate .. //depot/projects/tcpecn/kern/kern_condvar.c#2 integrate .. //depot/projects/tcpecn/kern/kern_conf.c#3 integrate .. //depot/projects/tcpecn/kern/kern_cpuset.c#2 integrate .. //depot/projects/tcpecn/kern/kern_descrip.c#7 integrate .. //depot/projects/tcpecn/kern/kern_event.c#4 integrate .. //depot/projects/tcpecn/kern/kern_exec.c#5 integrate .. //depot/projects/tcpecn/kern/kern_exit.c#4 integrate .. //depot/projects/tcpecn/kern/kern_fork.c#2 integrate .. //depot/projects/tcpecn/kern/kern_idle.c#2 integrate .. //depot/projects/tcpecn/kern/kern_intr.c#2 integrate .. //depot/projects/tcpecn/kern/kern_jail.c#4 integrate .. //depot/projects/tcpecn/kern/kern_kse.c#2 delete .. //depot/projects/tcpecn/kern/kern_kthread.c#2 integrate .. //depot/projects/tcpecn/kern/kern_linker.c#4 integrate .. //depot/projects/tcpecn/kern/kern_lockf.c#2 integrate .. //depot/projects/tcpecn/kern/kern_malloc.c#2 integrate .. //depot/projects/tcpecn/kern/kern_mbuf.c#4 integrate .. //depot/projects/tcpecn/kern/kern_module.c#4 integrate .. //depot/projects/tcpecn/kern/kern_ntptime.c#2 integrate .. //depot/projects/tcpecn/kern/kern_poll.c#2 integrate .. //depot/projects/tcpecn/kern/kern_priv.c#2 integrate .. //depot/projects/tcpecn/kern/kern_proc.c#5 integrate .. //depot/projects/tcpecn/kern/kern_resource.c#4 integrate .. //depot/projects/tcpecn/kern/kern_rwlock.c#6 integrate .. //depot/projects/tcpecn/kern/kern_shutdown.c#5 integrate .. //depot/projects/tcpecn/kern/kern_sig.c#4 integrate .. //depot/projects/tcpecn/kern/kern_switch.c#2 integrate .. //depot/projects/tcpecn/kern/kern_sx.c#3 integrate .. //depot/projects/tcpecn/kern/kern_synch.c#3 integrate .. //depot/projects/tcpecn/kern/kern_tc.c#4 integrate .. //depot/projects/tcpecn/kern/kern_thr.c#2 integrate .. //depot/projects/tcpecn/kern/kern_thread.c#4 integrate .. //depot/projects/tcpecn/kern/kern_timeout.c#3 integrate .. //depot/projects/tcpecn/kern/kern_umtx.c#3 integrate .. //depot/projects/tcpecn/kern/link_elf.c#3 integrate .. //depot/projects/tcpecn/kern/link_elf_obj.c#3 integrate .. //depot/projects/tcpecn/kern/makesyscalls.sh#2 integrate .. //depot/projects/tcpecn/kern/p1003_1b.c#2 integrate .. //depot/projects/tcpecn/kern/sched_4bsd.c#4 integrate .. //depot/projects/tcpecn/kern/sched_ule.c#6 integrate .. //depot/projects/tcpecn/kern/subr_autoconf.c#3 integrate .. //depot/projects/tcpecn/kern/subr_bus.c#5 integrate .. //depot/projects/tcpecn/kern/subr_eventhandler.c#2 integrate .. //depot/projects/tcpecn/kern/subr_log.c#2 integrate .. //depot/projects/tcpecn/kern/subr_mchain.c#2 integrate .. //depot/projects/tcpecn/kern/subr_prof.c#2 integrate .. //depot/projects/tcpecn/kern/subr_sleepqueue.c#3 integrate .. //depot/projects/tcpecn/kern/subr_smp.c#4 integrate .. //depot/projects/tcpecn/kern/subr_taskqueue.c#2 integrate .. //depot/projects/tcpecn/kern/subr_trap.c#3 integrate .. //depot/projects/tcpecn/kern/subr_witness.c#3 integrate .. //depot/projects/tcpecn/kern/sys_generic.c#4 integrate .. //depot/projects/tcpecn/kern/sys_process.c#2 integrate .. //depot/projects/tcpecn/kern/syscalls.c#6 integrate .. //depot/projects/tcpecn/kern/syscalls.master#6 integrate .. //depot/projects/tcpecn/kern/systrace_args.c#6 integrate .. //depot/projects/tcpecn/kern/tty.c#3 integrate .. //depot/projects/tcpecn/kern/tty_cons.c#4 integrate .. //depot/projects/tcpecn/kern/tty_pts.c#2 integrate .. //depot/projects/tcpecn/kern/tty_pty.c#4 integrate .. //depot/projects/tcpecn/kern/tty_subr.c#2 integrate .. //depot/projects/tcpecn/kern/tty_tty.c#2 integrate .. //depot/projects/tcpecn/kern/uipc_domain.c#2 integrate .. //depot/projects/tcpecn/kern/uipc_mbuf.c#4 integrate .. //depot/projects/tcpecn/kern/uipc_mqueue.c#4 integrate .. //depot/projects/tcpecn/kern/uipc_socket.c#3 integrate .. //depot/projects/tcpecn/kern/uipc_syscalls.c#6 integrate .. //depot/projects/tcpecn/kern/vfs_acl.c#3 integrate .. //depot/projects/tcpecn/kern/vfs_bio.c#7 integrate .. //depot/projects/tcpecn/kern/vfs_cache.c#4 integrate .. //depot/projects/tcpecn/kern/vfs_cluster.c#2 integrate .. //depot/projects/tcpecn/kern/vfs_default.c#5 integrate .. //depot/projects/tcpecn/kern/vfs_extattr.c#3 integrate .. //depot/projects/tcpecn/kern/vfs_hash.c#2 integrate .. //depot/projects/tcpecn/kern/vfs_lookup.c#4 integrate .. //depot/projects/tcpecn/kern/vfs_mount.c#6 integrate .. //depot/projects/tcpecn/kern/vfs_subr.c#7 integrate .. //depot/projects/tcpecn/kern/vfs_syscalls.c#6 integrate .. //depot/projects/tcpecn/kern/vfs_vnops.c#4 integrate .. //depot/projects/tcpecn/kern/vnode_if.src#4 integrate .. //depot/projects/tcpecn/modules/Makefile#5 integrate .. //depot/projects/tcpecn/modules/bktr/bktr/Makefile#2 integrate .. //depot/projects/tcpecn/modules/cmx/Makefile#1 branch .. //depot/projects/tcpecn/modules/em/Makefile#3 integrate .. //depot/projects/tcpecn/modules/geom/geom_part/Makefile#2 integrate .. //depot/projects/tcpecn/modules/geom/geom_part/geom_part_apm/Makefile#1 branch .. //depot/projects/tcpecn/modules/geom/geom_part/geom_part_bsd/Makefile#1 branch .. //depot/projects/tcpecn/modules/geom/geom_part/geom_part_gpt/Makefile#1 branch .. //depot/projects/tcpecn/modules/geom/geom_part/geom_part_mbr/Makefile#1 branch .. //depot/projects/tcpecn/modules/geom/geom_part/geom_part_pc98/Makefile#1 branch .. //depot/projects/tcpecn/modules/geom/geom_part/geom_part_vtoc8/Makefile#1 branch .. //depot/projects/tcpecn/modules/igb/Makefile#2 integrate .. //depot/projects/tcpecn/modules/ixgbe/Makefile#2 integrate .. //depot/projects/tcpecn/modules/krpc/Makefile#1 branch .. //depot/projects/tcpecn/modules/malo/Makefile#1 branch .. //depot/projects/tcpecn/modules/nfslockd/Makefile#1 branch .. //depot/projects/tcpecn/modules/sound/driver/emu10kx/Makefile#3 integrate .. //depot/projects/tcpecn/modules/uslcom/Makefile#1 branch .. //depot/projects/tcpecn/modules/vr/Makefile#2 integrate .. //depot/projects/tcpecn/modules/wpi/Makefile#2 integrate .. //depot/projects/tcpecn/modules/zfs/Makefile#4 integrate .. //depot/projects/tcpecn/net/bpf.c#4 integrate .. //depot/projects/tcpecn/net/bpf.h#3 integrate .. //depot/projects/tcpecn/net/bpf_buffer.c#1 branch .. //depot/projects/tcpecn/net/bpf_buffer.h#1 branch .. //depot/projects/tcpecn/net/bpf_filter.c#3 integrate .. //depot/projects/tcpecn/net/bpf_zerocopy.c#1 branch .. //depot/projects/tcpecn/net/bpf_zerocopy.h#1 branch .. //depot/projects/tcpecn/net/bpfdesc.h#2 integrate .. //depot/projects/tcpecn/net/ieee8023ad_lacp.c#3 integrate .. //depot/projects/tcpecn/net/ieee8023ad_lacp.h#3 integrate .. //depot/projects/tcpecn/net/if.c#2 integrate .. //depot/projects/tcpecn/net/if.h#3 integrate .. //depot/projects/tcpecn/net/if_ef.c#2 integrate .. //depot/projects/tcpecn/net/if_enc.c#4 integrate .. //depot/projects/tcpecn/net/if_ethersubr.c#2 integrate .. //depot/projects/tcpecn/net/if_fddisubr.c#2 integrate .. //depot/projects/tcpecn/net/if_gif.c#2 integrate .. //depot/projects/tcpecn/net/if_gre.c#2 integrate .. //depot/projects/tcpecn/net/if_iso88025subr.c#2 integrate .. //depot/projects/tcpecn/net/if_lagg.c#5 integrate .. //depot/projects/tcpecn/net/if_loop.c#2 integrate .. //depot/projects/tcpecn/net/if_media.h#2 integrate .. //depot/projects/tcpecn/net/if_sl.c#2 integrate .. //depot/projects/tcpecn/net/if_var.h#3 integrate .. //depot/projects/tcpecn/net/netisr.c#2 integrate .. //depot/projects/tcpecn/net/raw_cb.c#2 integrate .. //depot/projects/tcpecn/net/rtsock.c#2 integrate .. //depot/projects/tcpecn/netatalk/aarp.c#2 integrate .. //depot/projects/tcpecn/netatm/ipatm/ipatm_load.c#2 integrate .. //depot/projects/tcpecn/netatm/port.h#2 integrate .. //depot/projects/tcpecn/netatm/sigpvc/sigpvc_if.c#2 integrate .. //depot/projects/tcpecn/netatm/spans/spans_if.c#2 integrate .. //depot/projects/tcpecn/netatm/uni/uni_load.c#2 integrate .. //depot/projects/tcpecn/netgraph/netgraph.h#3 integrate .. //depot/projects/tcpecn/netgraph/ng_base.c#5 integrate .. //depot/projects/tcpecn/netgraph/ng_car.c#3 integrate .. //depot/projects/tcpecn/netgraph/ng_ksocket.c#2 integrate .. //depot/projects/tcpecn/netgraph/ng_l2tp.c#3 integrate .. //depot/projects/tcpecn/netgraph/ng_nat.h#3 integrate .. //depot/projects/tcpecn/netgraph/ng_pppoe.c#5 integrate .. //depot/projects/tcpecn/netgraph/ng_pptpgre.c#2 integrate .. //depot/projects/tcpecn/netgraph/ng_pptpgre.h#2 integrate .. //depot/projects/tcpecn/netgraph/ng_socket.c#3 integrate .. //depot/projects/tcpecn/netgraph/ng_tee.c#3 integrate .. //depot/projects/tcpecn/netinet/in.h#2 integrate .. //depot/projects/tcpecn/netinet/in_pcb.c#3 integrate .. //depot/projects/tcpecn/netinet/in_pcb.h#3 integrate .. //depot/projects/tcpecn/netinet/ip_fw2.c#5 integrate .. //depot/projects/tcpecn/netinet/ip_fw_nat.c#2 integrate .. //depot/projects/tcpecn/netinet/ip_ipsec.c#2 integrate .. //depot/projects/tcpecn/netinet/ip_output.c#3 integrate .. //depot/projects/tcpecn/netinet/libalias/alias.c#2 integrate .. //depot/projects/tcpecn/netinet/libalias/alias.h#2 integrate .. //depot/projects/tcpecn/netinet/libalias/alias_db.c#2 integrate .. //depot/projects/tcpecn/netinet/libalias/alias_ftp.c#2 integrate .. //depot/projects/tcpecn/netinet/libalias/alias_irc.c#2 integrate .. //depot/projects/tcpecn/netinet/libalias/alias_local.h#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Apr 2 19:11:17 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5AB3E1065675; Wed, 2 Apr 2008 19:11:17 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1993C1065673 for ; Wed, 2 Apr 2008 19:11:17 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DF67B8FC31 for ; Wed, 2 Apr 2008 19:11:16 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m32JBGU7051016 for ; Wed, 2 Apr 2008 19:11:16 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m32JBGJR051014 for perforce@freebsd.org; Wed, 2 Apr 2008 19:11:16 GMT (envelope-from sam@freebsd.org) Date: Wed, 2 Apr 2008 19:11:16 GMT Message-Id: <200804021911.m32JBGJR051014@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 139235 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Apr 2008 19:11:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=139235 Change 139235 by sam@sam_ebb on 2008/04/02 19:10:25 replace vendor driver for wired operation with a bsd-specific driver that doesn't have bugs like clearing interface flags and is 1/3rd smaller Affected files ... .. //depot/projects/vap/contrib/wpa_supplicant/driver_wired.c#3 delete .. //depot/projects/vap/usr.sbin/wpa/wpa_supplicant/driver_wired.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Apr 2 20:09:19 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A7D2C1065679; Wed, 2 Apr 2008 20:09:18 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6575F1065671 for ; Wed, 2 Apr 2008 20:09:18 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 500F08FC25 for ; Wed, 2 Apr 2008 20:09:18 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m32K9ICW056210 for ; Wed, 2 Apr 2008 20:09:18 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m32K9I68056208 for perforce@freebsd.org; Wed, 2 Apr 2008 20:09:18 GMT (envelope-from pgj@FreeBSD.org) Date: Wed, 2 Apr 2008 20:09:18 GMT Message-Id: <200804022009.m32K9I68056208@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 139237 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Apr 2008 20:09:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=139237 Change 139237 by pgj@disznohal on 2008/04/02 20:09:03 Fix composition, translation. Submitted by: gabor (mentor) Affected files ... .. //depot/projects/docproj_hu/books/handbook/users/chapter.sgml#3 edit Differences ... ==== //depot/projects/docproj_hu/books/handbook/users/chapter.sgml#3 (text+ko) ==== @@ -11,7 +11,7 @@ - Neil + Neil Blakey-Milner Írta: @@ -25,7 +25,7 @@ Áttekintés - A &os; lehetõvé teszi, hogy egy azon idõben + A &os; lehetõvé teszi, hogy egyazon idõben egyszerre több felhasználó is dolgozhasson a számítógépen. Közülük nyilvánvalóan csak egy képes elõtte @@ -46,42 +46,44 @@ - A &os; rendszerben megtalálható + a &os; rendszerben megtalálható különféle felhasználói hozzáférések közti - különbségeket. + különbségeket - Hogyan készítsünk új + hogyan készítsünk új felhasználói - hozzáféréseket. + hozzáféréseket - Hogyan töröljünk felhasználói - hozzáféréseket. + hogyan töröljünk felhasználói + hozzáféréseket - Hogyan változtassuk meg a + hogyan változtassuk meg a hozzáférés adatait, mint például a felhasználók teljes - nevét vagy a választott shelljét. + nevét vagy a választott + parancsértelmezõjét - Hogyan korlátozzuk az egyes + hogyan korlátozzuk az egyes hozzáféréseket vagy hozzáférések egy csoportját az olyan erõforrások, mint mondjuk a memória - vagy a processzoridõ védelmében. + vagy a processzoridõ védelmében - Hogyan használjuk csoportokat a - hozzáférések karbantartásának - megkönnyítésére. + hogyan használjuk csoportokat a + hozzáférések + karbantartásának + megkönnyítésére @@ -89,10 +91,11 @@ - A &unix; és a &os; alapjainak ismerete (). + a &unix; és a &os; alapjainak ismerete () + @@ -125,9 +128,9 @@ felhasználónevek létrehozására vonatkoznak. Általánosságban elmondható, hogy - a felhasználónevek legyenek kisbetûsek - és legfeljebb nyolc karakterbõl - álljanak. + a felhasználóneveknek kisbetûsek kell + lenniük és legfeljebb nyolc karakterbõl + állhatnak. @@ -140,8 +143,8 @@ üres is, ebben az esetben nincs szükség jelszóra a hozzáféréshez. Ez viszont többnyire egy nagyon rossz ötlet: minden - hozzáférést illik jelszóval - védeni. + hozzáférést erõsen ajánlott + jelszóval védeni. @@ -151,8 +154,8 @@ Az UID egy szám, amely hagyományosan - 0-tól 65535-ig terjed - + 0-tól 65535-ig terjed Lehetséges akár 4294967295-ig is számozni az UID/GID értékét, de az ekkora nagyságú @@ -163,8 +166,7 @@ , és a felhasználó rendszeren belüli egyedi azonosítására használatos. A - &os; magán belül az UID-ot a - felhasználók + &os; az UID-ot a felhasználók beazonosítására használja — bármelyik parancs, amely lehetõvé teszi felhasználónevek @@ -207,11 +209,11 @@ A bejelentkezési osztályok a - csoportszervezés kibõvítését - célozzák meg, további - rugalmasságot nyújtanak, amikor a rendszert az - egyes felhasználók igényeihez - szabjuk. + csoportszervezés + kibõvítését célozzák + meg, további rugalmasságot nyújtanak, + amikor a rendszert az egyes felhasználók + igényeihez szabjuk. @@ -238,13 +240,13 @@ A &os;-ben alapértelmezés szerint nem - évülnek a hozzáférések. Ha - azonban olyan hozzáféréseket kell - létrehoznunk, például egy + évülnek el a hozzáférések. + Ha azonban olyan hozzáféréseket kell + létrehoznunk, melyeknek korlátoznunk kell az + élettartamukat, mint például egy iskolában a diákok számára, - melyeknek korlátoznunk kell az élettartamukat, - meg tudjuk adni a lejáratuk idejét. Ezen - dátum után a + akkor ilyenkor meg tudjuk adni a lejáratuk + idejét. Ezen dátum után a hozzáféréssel már nem lehet bejelentkezni a rendszerbe, viszont a hozzátartozó könyvtárban @@ -272,12 +274,12 @@ A felhasználói könyvtár a - rendszerben található azon könyvtár - teljes elérési útvonala, ahová a - felhasználó a bejelentkezést - követõen kerül. Elterjedt megszokás, - hogy az összes felhasználó - könyvtárát a + rendszerben található azon + könyvtár teljes elérési + útvonala, ahová a felhasználó a + bejelentkezést követõen kerül. + Elterjedt megszokás, hogy az összes + felhasználó könyvtárát a /home/felhasználónév vagy a /usr/home/felhasználónév @@ -290,13 +292,15 @@ - Felhasználói shell + Felhasználói + parancsértelmezõ - A shell biztosítja azt az alapértelmezett - környezetet, amiben a felhasználó - kapcsolatba tud lépni a rendszerrel. - Többféle shell is akad, és a + A parancsértelmezõ biztosítja azt az + alapértelmezett környezetet, amiben a + felhasználó kapcsolatba tud lépni a + rendszerrel. Többféle + parancsértelmezõ is akad, és a tapasztaltabb felhasználók ragaszkodnak is némelyikükhöz, amely gyakran látható is a @@ -312,7 +316,7 @@ linkend="users-system">rendszer- és a felhasználói hozzáférések. Az adminisztátori - hozzáférés, amelyet gyakran + hozzáférés, amelyre gyakran rootként hivatkoznak, használatos a rendszer karbantartására, és semmilyen korlátozás nem @@ -323,6 +327,7 @@ használják a valódi emberek, akik bejelentkeznek, leveleket olvasnak és így tovább. + @@ -333,6 +338,7 @@ hozzáférések adminisztrátor (root) + Az adminisztátori hozzáférés, amelyet általában csak rootnak nevezünk, a rendszeradminisztrációs feladatok @@ -340,14 +346,14 @@ nem ajánlott az olyan hétköznapi tevékenységek elvégzéséhez, mint mondjuk a levelek olvasása és - írása, a rendszer bebarangolása vagy a + írása, a rendszer bejárása vagy a programozás. Ezért az adminisztrátor, eltérõen az átlagos felhasználói hozzáférésektõl, képes mindenféle határok nélkül - ténykedni, és az adminisztrátori + tevékenykedni, és az adminisztrátori hozzáférés helytelen használata látványos katasztrófákat idézhet elõ. A felhasználói @@ -357,7 +363,7 @@ legjobb, ha egyszerû felhasználói hozzáféréseket használunk, amint módunk van rá, hacsak nincs - szükségünk kifejezetten plusz + szükségünk kifejezetten különleges jogosultságokra. Minden esetben érdemes alaposan megfontolni az @@ -381,6 +387,7 @@ hogyan kell váltani egy mezei felhasználó és az adminisztrátor hozzáférése között. + @@ -390,6 +397,7 @@ hozzáférések rendszer + A rendszer által hozzáférések azok, amelyek olyan szolgáltatások futtatásáért felelõsek, mint mondjuk a @@ -407,6 +415,7 @@ hozzáférések operator + Ilyen rendszerfelhasználók a daemon, operator, bind (a névfeloldáshoz), @@ -417,7 +426,8 @@ hozzáférések nobody - A nobody (senki) egy + + A nobody (senki) egy általános jogosultságok nélküli rendszerfelhasználó. Mindazonáltal nem szabad elfelejtenünk, hogy minél több @@ -427,6 +437,7 @@ kapcsolatba és ennélfogva annál erõsebbé válik a rendszer számára ez a felhasználó. + @@ -437,6 +448,7 @@ hozzáférések felhasználó + A felhasználói hozzáférések a valós felhasználók elsõdleges eszközei a rendszer felé, és ezek a @@ -446,9 +458,9 @@ kárt okozzanak akár a rendszerben, akár egymásnak, valamint lehetõvé teszik a felhasználók számára a - környezeteik testreszabását a - többiekének módosítása - nélkül. + környezeteik testreszabását + anélkül, hogy többiekét + módosítani kellene. Minden olyan személynek, aki hozzá akar férni a rendszerünkhöz, rendelkeznie kell @@ -456,16 +468,17 @@ Ezáltal meg tudjuk állapítani ki mivel foglalkozik éppen a rendszerben, és meg tudjuk akadályozni, hogy a felhasználók - hozzápiszkáljanak egymás - beállításaihoz, olvassák egymás + elérjék egymás + beállításait, olvassák egymás leveleit és így tovább. Minden felhasználó alakítani tudja a saját környezetét, és ezzel mintegy - berendezkedik a rendszerünkben, különfélek - shellek, szövegszerkesztõk, + berendezkedik a rendszerünkben, különféle + parancsértelmezõk, szövegszerkesztõk, billentyû-hozzárendelések és nyelvek használatával. + @@ -501,34 +514,34 @@ &man.adduser.8; - Az új felhasználók + az új felhasználók felvételére ajánlott parancssoros - alkalmazás. + alkalmazás &man.rmuser.8; - A felhasználók + a felhasználók eltávolítására ajánlott - parancssoros alkalmazás. + parancssoros alkalmazás &man.chpass.1; - Rugalmas eszköz a felhasználói + rugalmas eszköz a felhasználói adatbázis információinak - megváltoztatására. + megváltoztatására &man.passwd.1; - Egy egyszerû parancssoros segédprogram a + egy egyszerû parancssoros segédprogram a elhasználói jelszavak - megváltoztatásához. + megváltoztatásához &man.pw.8; - Egy erõteljes és rugalmas + egy erõteljes és rugalmas segédeszköz a felhasználói hozzáférések teljeskörû - módosításához. + módosításához @@ -538,16 +551,18 @@ <command>adduser</command> - hozzáférések - hozzáadás + hozzáférések + hozzáadás - adduser + adduser - /usr/share/skel + /usr/share/skel vázkönyvtár + A &man.adduser.8; a felhasználók hozzáadására használható egyszerû program. Bejegyzéseket hoz létre a @@ -556,12 +571,14 @@ kívül még létrehozza az új felhasználó könyvtárát is, odamásolja az alapértelmezett - konfigurációs állományokat (az - ún. pontállományokat) a + konfigurációs állományokat a /usr/share/skel - könyvtárból, és opcionálisan - küld egy üdvözlõlevelet az - újdonsült felhasználónak. + könyvtárból (ezek a + felhasználóknál ponttal kezdõdõen + jelennek meg, de az említett könyvtárban + dot elõtaggal szerepelnek), és + opcionálisan küld egy üdvözlõlevelet + az újdonsült felhasználónak. Felhasználó hozzáadása a @@ -599,12 +616,13 @@ </example> <note> - <para>A jelszót a beírás során - egyáltalán nem jelenik meg, még csillagokat - sem láthatunk a karakterek helyén. Ezért - vigyázzunk, nehogy elgépeljük + <para>A jelszó a beírás során + egyáltalán nem jelenik meg, még + csillagokat sem láthatunk a karakterek helyén. + Ezért vigyázzunk, nehogy elgépeljük véletlenül a jelszót!</para> </note> + </sect2> <sect2 id="users-rmuser"> @@ -612,12 +630,12 @@ <indexterm><primary><command>rmuser</command></primary></indexterm> <indexterm> - <primary>hozzáférések</primary> - <secondary>eltávolítás</secondary> + <primary>hozzáférések</primary> + <secondary>eltávolítás</secondary> </indexterm> <para>Az &man.rmuser.8; használható a - felhasználók teljesen + felhasználók teljes eltávolítására a rendszerbõl. Az &man.rmuser.8; az alábbi lépeseket hajtja végre:</para> @@ -634,8 +652,9 @@ munkáit.</para> </step> <step> - <para>Kilövi a felhasználó által - birtokolt összes futó programot.</para> + <para>Leállítja a felhasználó + által birtokolt összes futó + programot.</para> </step> <step> <para>Eltávolítja a felhasználót a @@ -683,7 +702,7 @@ <para>A &man.rmuser.8; nem használható adminisztrátori hozzáférések törlésére, mivel az szinte majdnem mindig a - teljes pusztulást vonja maga után.</para> + teljes összeomlást vonja maga után.</para> <para>Alapértelmezés szerint interaktív módban mûködik, melynek során @@ -708,27 +727,29 @@ Removing files belonging to jantyik from /var/tmp/vi.recover: done. &prompt.root;</screen> </example> + </sect2> <sect2 id="users-chpass"> <title><command>chpass</command> chpass + A &man.chpass.1; segítségével meg tudjuk változtatni a felhasználói adatbázisban található információkat, mint például a - jelszavakat, shelleket és a személyes - adatokat. + jelszavakat, parancsértelmezõket és a + személyes adatokat. Csak a rendszeradminisztrátoroknak, mint mondjuk magának az adminisztrátornak, szabad megváltoztatnia a felhasználók adatait a &man.chpass.1; programmal. - Amikor az opcionális megadható - felhasználói névtõl eltekintve nem adunk - át neki paramétereket, a &man.chpass.1; egy + Amikor az opcionálisan megadható + felhasználói névtõl eltekintve nem + adunk át neki paramétereket, a &man.chpass.1; egy szövegszerkesztõben megnyitja az érintett felhasználó adatait. Miután kiléptünk belõle, a felhasználói @@ -765,8 +786,8 @@ Egy átlagos felhasználó a bemutatott adatoknak csak igen kis részét képes - módosítani, és azokat is csak magára - nézve. + módosítani, és azokat is csak saját + maga számára. A <command>chpass</command> interaktív @@ -784,24 +805,27 @@ <note> <para>A &man.chfn.1; és &man.chsh.1; parancsok - csupán linkek a &man.chpass.1; parancsra, akárcsak - a &man.ypchpass.1;, &man.ypchfn.1; és az - &man.ypchsh.1;. A NIS támogatása teljesen + csupán linkek a &man.chpass.1; parancsra, + akárcsak a &man.ypchpass.1;, &man.ypchfn.1; és + az &man.ypchsh.1;. A NIS támogatása teljesen magától mûködik, ezért az <literal>yp</literal> elõtag használata nem - kötelezõ. Ha ez nem érhetõ, nem kell + kötelezõ. Ha ez nem érthetõ, nem kell megijedni, a NIS-t majd a <xref linkend="network-servers">ben bemutatjuk.</para> </note> + </sect2> + <sect2 id="users-passwd"> <title><command>passwd</command> passwd - hozzáférések - jelszóváltoztatás + hozzáférések + jelszóváltoztatás + Felhasználóként a saját jelszavunkat, adminisztrátorként pedig bármelyik felhasználó jelszavát a @@ -833,7 +857,7 @@ jelszavának megváltoztatása adminisztrátorként - &prompt.root; passwd jantyik + &prompt.root; passwd jantyik Changing local password for jantyik. New password: Retype new password: @@ -847,29 +871,30 @@ két megadási módban mûködik. + - <command>pw</command> pw A &man.pw.8; egy olyan parancssori segédprogram, - amellyel felhasználókat és csoportokat tudunk - létrehozni, törölni, módosítani - és megjeleníteni. Ez tulajdonképpen a - rendszer felhasználókat és csoportokat - tároló állományainak egyfajta - kezelõfelülete. A &man.pw.8; kiválóan - paraméterezhetõ, aminek köszönhetõen - remekül kiaknázható tudása a - különféle shell szkriptekben, habár a - kezdõ felhasználók azonban - nehézkesebbnek érezhetik a kezelését - a korábban mutatott parancsokhoz képest. + amellyel felhasználókat és csoportokat + tudunk létrehozni, törölni, + módosítani és megjeleníteni. Ez + tulajdonképpen a rendszer felhasználókat + és csoportokat tároló + állományainak egyfajta kezelõfelülete. + A &man.pw.8; kiválóan paraméterezhetõ, + aminek köszönhetõen remekül + kiaknázható tudása a + különféle parancsértelmezõk + szkriptjeiben, habár a kezdõ + felhasználók nehézkesebbnek + érezhetik a kezelését a korábban + mutatott parancsokhoz képest. + - - @@ -877,12 +902,13 @@ korlátozása felhasználók - korlátozása - + korlátozása + hozzáférések korlátozás + Ha már vannak felhasználóink, gyakran szóba kerülhet esetükben a rendszer használatának korlátozása. A &os; @@ -901,9 +927,10 @@ kvóták lemezkvóták + A lemezkvóták a felhasználók - lemezhasználatát korlátozzák, és - lehetõvé teszik, hogy állandó + lemezhasználatát korlátozzák, + és lehetõvé teszik, hogy állandó újraszámolás nélkül, gyorsan ellenõrizni tudjuk ennek mértékét. A kvótákat a ban @@ -912,21 +939,20 @@ A többi erõforrás korlátozása magában foglalja a processzoridõ, memória és minden olyan erõforrás - lehatárolását, amihez a + behatárolását, amihez a felhasználó csak hozzá tud férni. Ezeket bejelentkezési osztályokon keresztül határozzuk meg, ezekrõl esik itt most szó. - - /etc/login.conf - + /etc/login.conf + A bejelentkezési osztályokat a /etc/login.conf állományban adhatjuk meg. Ennek pontos ismertetése nem tárgya ennek a szakasznak, de ezt megtalálhatjuk a &man.login.conf.5; man oldalon. Elegendõ csak annyit - mondanunk, hogy minden felhasználó tartozik egy + mondanunk, hogy minden felhasználóhoz tartozik egy bejelentkezési osztály (alapértelmezés szerint a default nevû), és minden egyes bejelentkezési osztályhoz tulajdonságok @@ -951,11 +977,10 @@ található beállításokat olvassa be, hanem az /etc/login.conf.db állományt, amiben gyorsabban lehet keresni. Az - /etc/login.conf.db /etc/login.conf - állományból történõ - legyártásához adjuk ki az alábbi - parancsot: + állományból az + /etc/login.conf.db állományt + az alábbi paranccsal tudjuk legyártani: &prompt.root; cap_mkdb /etc/login.conf @@ -985,23 +1010,24 @@ tulajdonságok speciális esetei.) Így aztán, minden további - magyarázkodás nélkül, felsoroljunk alant a - leggyakrabban alkalmazott erõforráskorlátokat + magyarázkodás nélkül, felsoroljunk alant + a leggyakrabban alkalmazott erõforráskorlátokat (a többi, más egyéb bejelentkezési tulajdonságokkal együtt, megtalálható a &man.login.conf.5; man oldalon). - coredumpsize + coredumpsize - coredumpsize - - felhasználók - korlátozása - coredumpsize - + coredumpsize + + felhasználók + korlátozása + coredumpsize + + A program által létrehozott memóriakivonat maximális méretét határolja be ez a korlát, @@ -1020,19 +1046,21 @@ emacs) összeomlása során keletkezõ memóriakivonatok felesleges helyfoglalásától. + - cputime + cputime - cputime - - felhasználók - korlátozása - cputime - + cputime + + felhasználók + korlátozása + cputime + + Az a maximális processzoridõ, amit a felhasználó által futtatott programok egyenként fogyaszthatnak. A vétkezõ @@ -1041,8 +1069,8 @@ Ez a korlát a - processzoridõre vonatkozik, nem - pedig a processzor + processzoridõre vonatkozik, + nem pedig a processzor kihasználtságának százalékára, ahogy a &man.top.1; és a &man.ps.1; szokta megjeleníteni. Ez @@ -1060,36 +1088,40 @@ - filesize + filesize - filesize - - felhasználók - korlátozása - filesize - + filesize + + felhasználók + korlátozása + filesize + + A felhasználó által - birtokolható állományok maximális - mérete. Eltérõen a lemezkvótáktól, ez a korlát az egyes állományokra vonatkozik, nem pedig a felhasználó összes állományára együttesen. + - maxproc + maxproc - maxproc - - felhasználók - korlátozása - maxproc - + maxproc + + felhasználók + korlátozása + maxproc + + A felhasználó által egyidõben, az elõtérben és a háttérben futtatható programok maximális száma. @@ -1114,39 +1146,41 @@ - memorylocked + memorylocked - memorylocked - - felhasználók - korlátozása - memorylocked - + memorylocked + + felhasználók + korlátozása + memorylocked + + Ezzel korlátozhatjuk az egyes futó programok által zárolható memóriaterület méretét a központi memóriában (ld. &man.mlock.2;). - Egyes rendszerkritikus programok, mint mondjuk a + Egyes rendszerkritikus programok, mint mondjuk az &man.amd.8;, zárolják magukat a központi memóriában, és ezért soha nem lapozódnak ki onnan. Ennek köszönhetõen nem érinti õket a rendszer lapozásból eredõ esetleges - vergõdése. + lelassulása. - memoryuse + memoryuse - memoryuse - - felhasználók - korlátozása - memoryuse - + memoryuse + + felhasználók + korlátozása + memoryuse + + Ez az a maximális memóriamennyiség, amelyet egy futó program egyszerre használhat. Ebbe együttesen beleértendõ a központi @@ -1159,15 +1193,16 @@ - openfiles + openfiles - openfiles - - felhasználók - korlátozása - openfiles - + openfiles + + felhasználók + korlátozása + openfiles + + A felhasználó egyes futtatott programjai által egy idõben megnyitható állományok maximális száma. @@ -1183,20 +1218,21 @@ - sbsize + sbsize - sbsize - - felhasználók - korlátozása - sbsize - + sbsize + + felhasználók + korlátozása + sbsize + + A korlátozás a felhasználó - által egyszerre maximálisan elérhetõ - hálózati memória és így a - rendszermag puffereire vonatkozik. Eredetileg a - régebbi, sok csatlakozást + által egyszerre maximálisan + elérhetõ hálózati memória + és így a rendszermag puffereire vonatkozik. + Eredetileg a régebbi, sok csatlakozást felemésztõ DoS (Denial of Service) támadások ellen nyújtana védelmet, de általánosságban @@ -1207,15 +1243,16 @@ - stacksize + stacksize - stacksize - - felhasználók - korlátozása - stacksize - + stacksize + + felhasználók + korlátozása + stacksize + + Ez a felhasználó által mûködtetett egyes programok vermeinek maximális mérete. Önmagában nem @@ -1288,27 +1325,27 @@ Az erõforrások - korlátozásáról, a bejelentkezési - osztályokról és + korlátozásáról, a + bejelentkezési osztályokról és tulajdonságaikról a hozzájuk tartozó - man oldalakon olvashatunk: &man.cap.mkdb.1; &man.getrlimit.2; + man oldalakon olvashatunk: &man.cap.mkdb.1;, &man.getrlimit.2; és &man.login.conf.5;. + Csoportok csoportok - >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Apr 2 20:17:29 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE7381065675; Wed, 2 Apr 2008 20:17:28 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9DD7A1065673 for ; Wed, 2 Apr 2008 20:17:28 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8A2FE8FC2D for ; Wed, 2 Apr 2008 20:17:28 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m32KHSWI056478 for ; Wed, 2 Apr 2008 20:17:28 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m32KHSt9056476 for perforce@freebsd.org; Wed, 2 Apr 2008 20:17:28 GMT (envelope-from pgj@FreeBSD.org) Date: Wed, 2 Apr 2008 20:17:28 GMT Message-Id: <200804022017.m32KHSt9056476@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 139238 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Apr 2008 20:17:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=139238 Change 139238 by pgj@disznohal on 2008/04/02 20:16:34 Fix translation. Submitted by: gabor (mentor) Affected files ... .. //depot/projects/docproj_hu/books/handbook/geom/chapter.sgml#7 edit Differences ... ==== //depot/projects/docproj_hu/books/handbook/geom/chapter.sgml#7 (text+ko) ==== @@ -691,7 +691,7 @@ állományrendszerük szerint elnevezett könyvtára a /dev könyvtáron - belül. Mondjuk az UFS2 + belül. Például az UFS2 állományrendszer-címkék a /dev/ufs2 könyvtárban keletkeznek. From owner-p4-projects@FreeBSD.ORG Wed Apr 2 20:47:02 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 96C5A1065732; Wed, 2 Apr 2008 20:47:02 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4C8CE106571C for ; Wed, 2 Apr 2008 20:47:01 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D51AD8FC15 for ; Wed, 2 Apr 2008 20:47:01 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m32Kl1kC057450 for ; Wed, 2 Apr 2008 20:47:01 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m32Kl1lA057448 for perforce@freebsd.org; Wed, 2 Apr 2008 20:47:01 GMT (envelope-from sam@freebsd.org) Date: Wed, 2 Apr 2008 20:47:01 GMT Message-Id: <200804022047.m32Kl1lA057448@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 139239 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Apr 2008 20:47:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=139239 Change 139239 by sam@sam_ebb on 2008/04/02 20:46:28 remove iv_cryptocaps; crypto capabilities are a property of the driver/device so they should never be different from one vap to another Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211.c#34 edit .. //depot/projects/vap/sys/net80211/ieee80211_crypto.c#13 edit .. //depot/projects/vap/sys/net80211/ieee80211_ddb.c#11 edit .. //depot/projects/vap/sys/net80211/ieee80211_var.h#37 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211.c#34 (text+ko) ==== @@ -324,7 +324,6 @@ vap->iv_flags_ext = ic->ic_flags_ext; vap->iv_flags_ven = ic->ic_flags_ven; vap->iv_caps = ic->ic_caps &~ IEEE80211_C_OPMODE; - vap->iv_cryptocaps = ic->ic_cryptocaps; vap->iv_htcaps = ic->ic_htcaps; vap->iv_opmode = opmode; switch (opmode) { ==== //depot/projects/vap/sys/net80211/ieee80211_crypto.c#13 (text+ko) ==== @@ -262,6 +262,7 @@ ieee80211_crypto_newkey(struct ieee80211vap *vap, int cipher, int flags, struct ieee80211_key *key) { + struct ieee80211com *ic = vap->iv_ic; const struct ieee80211_cipher *cip; ieee80211_keyix keyix, rxkeyix; void *keyctx; @@ -309,7 +310,7 @@ * If the hardware does not support the cipher then * fallback to a host-based implementation. */ - if ((vap->iv_cryptocaps & (1<ic_cryptocaps & (1<ic_name); @@ -321,7 +322,7 @@ * the cipher modules honor it. */ if (cipher == IEEE80211_CIPHER_TKIP && - (vap->iv_cryptocaps & IEEE80211_CRYPTO_TKIPMIC) == 0) { + (ic->ic_cryptocaps & IEEE80211_CRYPTO_TKIPMIC) == 0) { IEEE80211_DPRINTF(vap, IEEE80211_MSG_CRYPTO, "%s: no h/w support for TKIP MIC, falling back to s/w\n", __func__); ==== //depot/projects/vap/sys/net80211/ieee80211_ddb.c#11 (text+ko) ==== @@ -330,8 +330,6 @@ db_printf("\tflags_ext=%b\n", vap->iv_flags_ext, IEEE80211_FEXT_BITS); db_printf("\tflags_ven=%b\n", vap->iv_flags_ven, IEEE80211_FVEN_BITS); db_printf("\tcaps=%b\n", vap->iv_caps, IEEE80211_C_BITS); - db_printf("\tcryptocaps=%b\n", - vap->iv_cryptocaps, IEEE80211_C_CRYPTO_BITS); db_printf("\thtcaps=%b\n", vap->iv_htcaps, IEEE80211_C_HTCAP_BITS); _db_show_stats(&vap->iv_stats); ==== //depot/projects/vap/sys/net80211/ieee80211_var.h#37 (text+ko) ==== @@ -293,7 +293,6 @@ uint32_t iv_flags_ven; /* vendor state flags */ uint32_t iv_caps; /* capabilities */ uint32_t iv_htcaps; /* HT capabilities */ - uint32_t iv_cryptocaps; /* crypto capabilities */ enum ieee80211_opmode iv_opmode; /* operation mode */ enum ieee80211_state iv_state; /* state machine state */ void (*iv_newstate_cb)(struct ieee80211vap *, From owner-p4-projects@FreeBSD.ORG Wed Apr 2 20:52:09 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5981A1065670; Wed, 2 Apr 2008 20:52:09 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 19310106566B for ; Wed, 2 Apr 2008 20:52:09 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 04DDC8FC1B for ; Wed, 2 Apr 2008 20:52:09 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m32Kq8Jq066895 for ; Wed, 2 Apr 2008 20:52:08 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m32Kq8VG066893 for perforce@freebsd.org; Wed, 2 Apr 2008 20:52:08 GMT (envelope-from pgj@FreeBSD.org) Date: Wed, 2 Apr 2008 20:52:08 GMT Message-Id: <200804022052.m32Kq8VG066893@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 139240 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Apr 2008 20:52:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=139240 Change 139240 by pgj@disznohal on 2008/04/02 20:51:20 Fix translation, format. Submitted by: gabor (mentor) Affected files ... .. //depot/projects/docproj_hu/books/handbook/boot/chapter.sgml#5 edit Differences ... ==== //depot/projects/docproj_hu/books/handbook/boot/chapter.sgml#5 (text+ko) ==== @@ -13,6 +13,7 @@ Áttekintés + rendszerindítás rendszertöltõ @@ -138,9 +139,7 @@ közremûködésével. Master Boot Record (MBR) - Boot Manager - Boot Loader Az MBR-ben található programkódot @@ -201,7 +200,7 @@ második fokozatban futtatható programok méretére. A feladatok ilyen módon történõ összefûzése azonban a - &os; számára egy sokkalta rugalmasabb + &os; számára egy sokkal rugalmasabb betöltõt eredményez. rendszermag @@ -226,7 +225,7 @@ elindítja mindazon programokat, amelyeknek egy &os; rendszer indulásakor futnia kell. - + A boot manager és az indulás fokozatai @@ -235,6 +234,7 @@ A boot manager + Master Boot Record (MBR) Az MBR-ben található programkódot, @@ -251,7 +251,7 @@ állományon alapszik. (A boot0 program nagyon egyszerû, hiszen az MBR-ben elhelyezhetõ - kód csak 446 byte hosszúságú + kód csak 446 bájt hosszúságú lehet, mert a végében még el kell férnie a slice-táblának és az 0x55AA azonosítónak.) Ha @@ -367,8 +367,8 @@ /boot/boot méretébõl. - Legfeljebb 512 byte-os méreténél fogva - a boot1 állomány nagyon + Legfeljebb 512 bájtos méreténél + fogva a boot1 állomány nagyon egyszerû felépítésû, és éppen csak annyit tud a slice-ra vonatkozó információkat tároló &os; @@ -429,6 +429,7 @@ ellenõrizzük kiadása elõtt a &man.bsdlabel.8; parancsot! + @@ -436,6 +437,7 @@ (/boot/loader) boot-loader + A betöltõ a három fokozatú rendszertöltés utolsó állomása. Az állományrendszerben @@ -686,6 +688,7 @@ egyfelhasználós mód + Így indíthatjuk egyfelhasználós módban az általunk használt rendszermagot: @@ -699,9 +702,7 @@ töltsük be helyettük a korábbi (vagy egy másik) rendszermagot: - - kernel.old - + kernel.old unload load kernel.old @@ -736,13 +737,15 @@ load -t userconfig_script /boot/kernel.conf - + + Kapcsolat a rendszermaggal a rendszerindítás folyamán + rendszermag kapcsolat a @@ -760,11 +763,13 @@ azoknak megfelelõen viselkedik. + rendszermag rendszerindítási paraméter + A rendszermag paraméterei A rendszermag leginkább használt @@ -840,9 +845,9 @@ - - device.hints - + + device.hints + Eszköz útmutatók (device.hints) @@ -959,6 +964,7 @@ man oldalt. Bõvebben információért ld. a &man.device.hints.5;, &man.kenv.1;, &man.loader.conf.5; és &man.loader.8; man oldalakat. + @@ -993,6 +999,7 @@ Egyfelhasználós mód + egyfelhasználós mód konzol @@ -1051,6 +1058,7 @@ Többfelhasználós mód + többfelhasználós mód @@ -1063,6 +1071,7 @@ konfigurálását. + rc-állományok Az erõforrások konfigurációja (rc) @@ -1097,9 +1106,8 @@ A leállítási folyamat - - leállítás - + + leállítás A &man.shutdown.8; paranccsal vezérelt leállítás során az &man.init.8; @@ -1108,7 +1116,7 @@ követõen TERM (befejeztetés) jelzést küld az aktuálisan futó folyamatoknak, és kis idõ múlva pedig - KILL (kilövés) jelzést + KILL (leállítás) jelzést azokat, amelyek még nem álltak le addig a pillanatig. From owner-p4-projects@FreeBSD.ORG Wed Apr 2 21:04:22 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1014A1065676; Wed, 2 Apr 2008 21:04:22 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C41FA1065674 for ; Wed, 2 Apr 2008 21:04:21 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B07728FC1A for ; Wed, 2 Apr 2008 21:04:21 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m32L4LJY068498 for ; Wed, 2 Apr 2008 21:04:21 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m32L4Lo9068496 for perforce@freebsd.org; Wed, 2 Apr 2008 21:04:21 GMT (envelope-from pgj@FreeBSD.org) Date: Wed, 2 Apr 2008 21:04:21 GMT Message-Id: <200804022104.m32L4Lo9068496@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 139242 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Apr 2008 21:04:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=139242 Change 139242 by pgj@disznohal on 2008/04/02 21:03:37 Fix translation. Submitted by: gabor (mentor) Affected files ... .. //depot/projects/docproj_hu/books/handbook/introduction/chapter.sgml#6 edit Differences ... ==== //depot/projects/docproj_hu/books/handbook/introduction/chapter.sgml#6 (text+ko) ==== @@ -1046,10 +1046,11 @@ committerek - A committerek azok az emberek, - akik a CVS-fához írási joggal - rendelkeznek, tehát módosítást - hajthatnak végre a &os; forrásaiban (a + A hivatalos fejlesztõk + (committerek) azok az emberek, akik a + CVS-fához írási joggal rendelkeznek, + tehát módosítást hajthatnak + végre a &os; forrásaiban (a committer kifejezés a &man.cvs.1; commit parancsából származik, amelyet arra használunk, hogy From owner-p4-projects@FreeBSD.ORG Wed Apr 2 21:37:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A4B21065671; Wed, 2 Apr 2008 21:37:59 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 58C98106566B for ; Wed, 2 Apr 2008 21:37:59 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4576E8FC29 for ; Wed, 2 Apr 2008 21:37:59 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m32LbxE1069553 for ; Wed, 2 Apr 2008 21:37:59 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m32Lbxxe069551 for perforce@freebsd.org; Wed, 2 Apr 2008 21:37:59 GMT (envelope-from pgj@FreeBSD.org) Date: Wed, 2 Apr 2008 21:37:59 GMT Message-Id: <200804022137.m32Lbxxe069551@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 139243 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Apr 2008 21:38:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=139243 Change 139243 by pgj@disznohal on 2008/04/02 21:37:04 Reword a paragraph. Submitted by: gabor (mentor) Affected files ... .. //depot/projects/docproj_hu/books/handbook/jails/chapter.sgml#7 edit Differences ... ==== //depot/projects/docproj_hu/books/handbook/jails/chapter.sgml#7 (text+ko) ==== @@ -89,13 +89,13 @@ A jail alrendszerhez kapcsolódó fogalmak - A &os;-ben található jail alrendszerhez - tartozó részek és azok belsõ - mûködésének, valamint a rendszer - többi részével történõ - együttmûködésének minél jobb - megértése érdekében az alábbi - fogalmakat használjuk a fejezetben: + A fejezet további részében a + következõ fogalmakat fogjuk használni, hogy a &os; + jailekhez tartozó egyes részeit és azok + belsõ mûködését, valamint + kapcsolatukat a rendszer többi részével + még inkább érthetõvé + tegyük: From owner-p4-projects@FreeBSD.ORG Wed Apr 2 21:47:10 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 97F2D1065674; Wed, 2 Apr 2008 21:47:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 56FE5106566B for ; Wed, 2 Apr 2008 21:47:10 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 431858FC16 for ; Wed, 2 Apr 2008 21:47:10 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m32LlAu1069896 for ; Wed, 2 Apr 2008 21:47:10 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m32LlAfU069894 for perforce@freebsd.org; Wed, 2 Apr 2008 21:47:10 GMT (envelope-from sam@freebsd.org) Date: Wed, 2 Apr 2008 21:47:10 GMT Message-Id: <200804022147.m32LlAfU069894@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 139244 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Apr 2008 21:47:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=139244 Change 139244 by sam@sam_ebb on 2008/04/02 21:47:04 Tweak ioctl handling to give driver more control on parameter changes: o move iv_reset callback up into set80211 so we can pass the IEEE80211_IOC_* code to the driver; doing this in the top-level was pretty pointless as drivers don't get access to the indirect cmd block and so cannot identify what parameter was changed o change some parameters from doing ENETRESET (clock state machine) to ERESTART (pass through iv_reset): IEEE80211_IOC_WPA, IEEE80211_IOC_WME, IEEE80211_IOC_FF, IEEE80211_IOC_FRAGTHRESHOLD, IEEE80211_IOC_BURST, IEEE80211_IOC_BMISSTHRESHOLD; this list is tentative and needs more review Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#51 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#51 (text+ko) ==== @@ -2611,12 +2611,14 @@ vap->iv_flags |= IEEE80211_F_PRIVACY; } else vap->iv_flags &= ~IEEE80211_F_PRIVACY; + /* XXX ERESTART? */ break; case IEEE80211_IOC_DROPUNENCRYPTED: if (ireq->i_val) vap->iv_flags |= IEEE80211_F_DROPUNENC; else vap->iv_flags &= ~IEEE80211_F_DROPUNENC; + /* XXX ERESTART? */ break; case IEEE80211_IOC_WPAKEY: error = ieee80211_ioctl_setkey(vap, ireq); @@ -2634,6 +2636,7 @@ vap->iv_flags |= IEEE80211_F_COUNTERM; } else vap->iv_flags &= ~IEEE80211_F_COUNTERM; + /* XXX ERESTART? */ break; case IEEE80211_IOC_WPA: if (ireq->i_val > 3) @@ -2651,7 +2654,7 @@ vap->iv_flags |= IEEE80211_F_WPA1 | IEEE80211_F_WPA2; break; } - error = ENETRESET; /* XXX optimize */ + error = ERESTART; /* NB: can change beacon frame */ break; case IEEE80211_IOC_WME: if (ireq->i_val) { @@ -2660,7 +2663,7 @@ ieee80211_syncflag(vap, IEEE80211_F_WME); } else ieee80211_syncflag(vap, -IEEE80211_F_WME); - error = ENETRESET; + error = ERESTART; /* NB: can change beacon frame */ break; case IEEE80211_IOC_HIDESSID: if (ireq->i_val) @@ -2793,7 +2796,7 @@ vap->iv_flags |= IEEE80211_F_FF; } else vap->iv_flags &= ~IEEE80211_F_FF; - error = ENETRESET; + error = ERESTART; break; case IEEE80211_IOC_TURBOP: if (ireq->i_val) { @@ -2838,7 +2841,7 @@ ireq->i_val <= IEEE80211_FRAG_MAX)) return EINVAL; vap->iv_fragthreshold = ireq->i_val; - error = ENETRESET; + error = ERESTART; break; case IEEE80211_IOC_BURST: if (ireq->i_val) { @@ -2847,14 +2850,14 @@ ieee80211_syncflag(vap, IEEE80211_F_BURST); } else ieee80211_syncflag(vap, -IEEE80211_F_BURST); - error = ENETRESET; /* XXX maybe not for station? */ + error = ERESTART; break; case IEEE80211_IOC_BMISSTHRESHOLD: if (!(IEEE80211_HWBMISS_MIN <= ireq->i_val && ireq->i_val <= IEEE80211_HWBMISS_MAX)) return EINVAL; vap->iv_bmissthreshold = ireq->i_val; - error = ENETRESET; + error = ERESTART; break; case IEEE80211_IOC_CURCHAN: error = ieee80211_ioctl_setcurchan(vap, ireq); @@ -2873,7 +2876,7 @@ } else vap->iv_flags_ext &= ~(IEEE80211_FEXT_SHORTGI20 | IEEE80211_FEXT_SHORTGI40); - error = ERESTART; /* XXX ENETRESET? */ + error = ERESTART; break; case IEEE80211_IOC_AMPDU: if (ireq->i_val && (vap->iv_htcaps & IEEE80211_HTC_AMPDU) == 0) @@ -2888,7 +2891,7 @@ vap->iv_flags_ext &= ~IEEE80211_FEXT_AMPDU_RX; /* NB: reset only if we're operating on an 11n channel */ if (isvapht(vap)) - error = ERESTART; /* XXX ENETRESET? */ + error = ERESTART; break; case IEEE80211_IOC_AMPDU_LIMIT: if (!(IEEE80211_HTCAP_MAXRXAMPDU_8K <= ireq->i_val && @@ -2898,14 +2901,14 @@ vap->iv_ampdu_rxmax = ireq->i_val; else vap->iv_ampdu_limit = ireq->i_val; - error = ERESTART; /* XXX ENETRESET? */ + error = ERESTART; break; case IEEE80211_IOC_AMPDU_DENSITY: if (!(IEEE80211_HTCAP_MPDUDENSITY_NA <= ireq->i_val && ireq->i_val <= IEEE80211_HTCAP_MPDUDENSITY_16)) return EINVAL; vap->iv_ampdu_density = ireq->i_val; - error = ERESTART; /* XXX ENETRESET? */ + error = ERESTART; break; case IEEE80211_IOC_AMSDU: if (ireq->i_val && (vap->iv_htcaps & IEEE80211_HTC_AMSDU) == 0) @@ -2920,7 +2923,7 @@ vap->iv_flags_ext &= ~IEEE80211_FEXT_AMSDU_RX; /* NB: reset only if we're operating on an 11n channel */ if (isvapht(vap)) - error = ERESTART; /* XXX ENETRESET? */ + error = ERESTART; break; case IEEE80211_IOC_AMSDU_LIMIT: /* XXX validate */ @@ -2935,7 +2938,7 @@ vap->iv_flags_ext &= ~IEEE80211_FEXT_PUREN; /* NB: reset only if we're operating on an 11n channel */ if (isvapht(vap)) - error = ERESTART; /* XXX ENETRESET? */ + error = ERESTART; break; case IEEE80211_IOC_DOTH: if (ireq->i_val) { @@ -2967,7 +2970,7 @@ vap->iv_flags_ext &= ~IEEE80211_FEXT_HTCOMPAT; /* NB: reset only if we're operating on an 11n channel */ if (isvapht(vap)) - error = ERESTART; /* XXX ENETRESET? */ + error = ERESTART; break; case IEEE80211_IOC_DWDS: if (ireq->i_val) { @@ -3048,6 +3051,22 @@ error = EINVAL; break; } + /* + * The convention is that ENETRESET means an operation + * requires a complete re-initialization of the device (e.g. + * changing something that affects the association state). + * ERESTART means the request may be handled with only a + * reload of the hardware state. We hand ERESTART requests + * to the iv_reset callback so the driver can decide. If + * a device does not fillin iv_reset then it defaults to one + * that returns ENETRESET. Otherwise a driver may return + * ENETRESET (in which case a full reset will be done) or + * 0 to mean there's no need to do anything (e.g. when the + * change has no effect on the driver/device). + */ + if (error == ERESTART) + error = IFNET_IS_UP_RUNNING(vap->iv_ifp) ? + vap->iv_reset(vap, ireq->i_type) : 0; if (error == ENETRESET && !IS_UP_AUTO(vap)) error = 0; return error; @@ -3217,14 +3236,7 @@ * The convention is to return ENETRESET when an operation * requires a complete re-initialization of the device (e.g. * changing something that affects the association state). - * If ERESTART is returned then the operation requires a - * reload of the hardware state but not a complete re-init; - * in that case we use the iv_reset callback. If a device - * does not fillin iv_reset then it defaults to one that - * returns ENETRESET--which may be suboptimal. */ - if (error == ERESTART) - error = IFNET_IS_UP_RUNNING(ifp) ? vap->iv_reset(vap, cmd) : 0; if (error == ENETRESET) { if (IFNET_IS_UP_RUNNING(ifp)) ieee80211_init(vap); From owner-p4-projects@FreeBSD.ORG Wed Apr 2 22:06:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 95B981065674; Wed, 2 Apr 2008 22:06:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 55B961065670 for ; Wed, 2 Apr 2008 22:06:30 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4209C8FC14 for ; Wed, 2 Apr 2008 22:06:30 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m32M6UKd071943 for ; Wed, 2 Apr 2008 22:06:30 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m32M6Uas071941 for perforce@freebsd.org; Wed, 2 Apr 2008 22:06:30 GMT (envelope-from sam@freebsd.org) Date: Wed, 2 Apr 2008 22:06:30 GMT Message-Id: <200804022206.m32M6Uas071941@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 139245 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Apr 2008 22:06:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=139245 Change 139245 by sam@sam_ebb on 2008/04/02 22:06:16 Handle older parts that cannot do TKIP MIC in hardware together with WME: o when WME is enabled for use and the device is incapable of doing TKIP MIC in hardware disable it and disable the capability in ic_cryptocaps so net80211 will setup keys to use s/w MIC support o do above work on callbacks through iv_reset so dynamic changes to wme use are handled o re-renable use of WME by default now that we don't silently break Affected files ... .. //depot/projects/vap/sys/dev/ath/if_ath.c#57 edit .. //depot/projects/vap/sys/dev/ath/if_athvar.h#19 edit Differences ... ==== //depot/projects/vap/sys/dev/ath/if_ath.c#57 (text+ko) ==== @@ -547,6 +547,13 @@ if (ath_hal_hastkipsplit(ah) || !ath_hal_settkipsplit(ah, AH_FALSE)) sc->sc_splitmic = 1; + /* + * If the h/w can do TKIP MIC together with WME then + * we use it; otherwise we force the MIC to be done + * in software by the net80211 layer. + */ + if (ath_hal_haswmetkipmic(ah)) + sc->sc_wmetkipmic = 1; } sc->sc_hasclrkey = ath_hal_ciphersupported(ah, HAL_CIPHER_CLR); sc->sc_mcastkey = ath_hal_getmcastkeysearch(ah); @@ -862,9 +869,6 @@ ieee80211_vap_setup(ic, vap, name, unit, opmode, flags, bssid, mac); ATH_LOCK(sc); - /* XXX turn off WME until we fix WME+TKIP for older chips */ - vap->iv_flags &= ~IEEE80211_F_WME; - /* h/w crypto support */ vap->iv_key_alloc = ath_key_alloc; vap->iv_key_delete = ath_key_delete; @@ -1280,6 +1284,28 @@ #undef N } +/* + * Handle TKIP MIC setup to deal hardware that doesn't do MIC + * calcs together with WME. If necessary disable the crypto + * hardware and mark the 802.11 state so keys will be setup + * with the MIC work done in software. + */ +static void +ath_settkipmic(struct ath_softc *sc) +{ + struct ieee80211com *ic = &sc->sc_ic; + + if ((ic->ic_cryptocaps & IEEE80211_CRYPTO_TKIP) && !sc->sc_wmetkipmic) { + if (ic->ic_flags & IEEE80211_F_WME) { + ath_hal_settkipmic(sc->sc_ah, AH_FALSE); + ic->ic_cryptocaps &= ~IEEE80211_CRYPTO_TKIPMIC; + } else { + ath_hal_settkipmic(sc->sc_ah, AH_TRUE); + ic->ic_cryptocaps |= IEEE80211_CRYPTO_TKIPMIC; + } + } +} + static void ath_init(void *arg) { @@ -1307,6 +1333,7 @@ * and then setup of the interrupt mask. */ ath_mapchan(&sc->sc_curchan, ic->ic_curchan); + ath_settkipmic(sc); if (!ath_hal_reset(ah, sc->sc_opmode, &sc->sc_curchan, AH_FALSE, &status)) { if_printf(ifp, "unable to reset hardware; hal status %u\n", status); @@ -1457,6 +1484,7 @@ ath_hal_intrset(ah, 0); /* disable interrupts */ ath_draintxq(sc); /* stop xmit side */ ath_stoprecv(sc); /* stop recv side */ + ath_settkipmic(sc); /* configure TKIP MIC handling */ /* NB: indicate channel change so we do a full reset */ if (!ath_hal_reset(ah, sc->sc_opmode, &sc->sc_curchan, AH_TRUE, &status)) if_printf(ifp, "%s: unable to reset hardware; hal status %u\n", ==== //depot/projects/vap/sys/dev/ath/if_athvar.h#19 (text+ko) ==== @@ -245,7 +245,8 @@ sc_hastsfadd: 1,/* tsf adjust support */ sc_beacons : 1,/* beacons running */ sc_swbmiss : 1,/* sta mode using sw bmiss */ - sc_stagbeacons:1;/* use staggered beacons */ + sc_stagbeacons:1,/* use staggered beacons */ + sc_wmetkipmic:1;/* can do WME+TKIP MIC */ /* rate tables */ #define IEEE80211_MODE_HALF (IEEE80211_MODE_MAX+0) #define IEEE80211_MODE_QUARTER (IEEE80211_MODE_MAX+1) @@ -506,12 +507,18 @@ (*(uint16_t *)(((uint8_t *)(_ah)) + 520) = (_rd)) #define ath_hal_getcountrycode(_ah, _pcc) \ (*(_pcc) = (_ah)->ah_countryCode) +#define ath_hal_gettkipmic(_ah) \ + (ath_hal_getcapability(_ah, HAL_CAP_TKIP_MIC, 1, NULL) == HAL_OK) +#define ath_hal_settkipmic(_ah, _v) \ + ath_hal_setcapability(_ah, HAL_CAP_TKIP_MIC, 1, _v, NULL) #define ath_hal_hastkipsplit(_ah) \ (ath_hal_getcapability(_ah, HAL_CAP_TKIP_SPLIT, 0, NULL) == HAL_OK) #define ath_hal_gettkipsplit(_ah) \ (ath_hal_getcapability(_ah, HAL_CAP_TKIP_SPLIT, 1, NULL) == HAL_OK) #define ath_hal_settkipsplit(_ah, _v) \ ath_hal_setcapability(_ah, HAL_CAP_TKIP_SPLIT, 1, _v, NULL) +#define ath_hal_haswmetkipmic(_ah) \ + (ath_hal_getcapability(_ah, HAL_CAP_WME_TKIPMIC, 0, NULL) == HAL_OK) #define ath_hal_hwphycounters(_ah) \ (ath_hal_getcapability(_ah, HAL_CAP_PHYCOUNTERS, 0, NULL) == HAL_OK) #define ath_hal_hasdiversity(_ah) \ From owner-p4-projects@FreeBSD.ORG Wed Apr 2 23:32:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2CC1B1065670; Wed, 2 Apr 2008 23:32:05 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DAF08106566C for ; Wed, 2 Apr 2008 23:32:04 +0000 (UTC) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C7C908FC1C for ; Wed, 2 Apr 2008 23:32:04 +0000 (UTC) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m32NW44x075513 for ; Wed, 2 Apr 2008 23:32:04 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m32NW2AL075511 for perforce@freebsd.org; Wed, 2 Apr 2008 23:32:02 GMT (envelope-from wsalamon@computer.org) Date: Wed, 2 Apr 2008 23:32:02 GMT Message-Id: <200804022332.m32NW2AL075511@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 139247 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Apr 2008 23:32:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=139247 Change 139247 by wsalamon@vh2 on 2008/04/02 23:31:05 Integrate development branch from parent. Affected files ... .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/acpica/acpi_machdep.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/acpica/madt.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/amd64_mem.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/cpu_switch.S#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/genassym.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/intr_machdep.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/legacy.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/mem.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/mp_machdep.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/mptable.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/nexus.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/prof_machdep.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/trap.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/vm_machdep.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/conf/DEFAULTS#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/ia32/ia32_signal.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/atomic.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/clock.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/intr_machdep.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/nexusvar.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/param.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/pcb.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/pmap.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/specialreg.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/timerreg.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/isa/atpic.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/isa/clock.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/linux32/linux32_proto.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/linux32/linux32_syscall.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/linux32/linux32_sysent.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/linux32/linux32_sysvec.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/linux32/syscalls.master#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/busdma_machdep.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/elf_trampoline.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/intr.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/machdep.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/nexus.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/trap.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/uio_machdep.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/vm_machdep.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/conf/AVILA#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/conf/AVILA.hints#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/conf/BWCT#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/conf/CRB#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/conf/EP80219#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/conf/HL200#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/conf/IQ31244#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/conf/KB920X#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/conf/SIMICS#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/conf/SKYEYE#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/param.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/pmap.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i8134x/crb_machdep.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/ixp425/if_npe.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/ixp425/ixdp425_pci.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/common/dev_net.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/forth/loader.conf#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/btx/btx/btx.S#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/cdboot/cdboot.s#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/pxeldr/pxeldr.S#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/cdboot/cdboot.s#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/powerpc/uboot/metadata.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/uboot/Makefile#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/uboot/common/main.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/uboot/lib/Makefile#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/uboot/lib/api_public.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/uboot/lib/console.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/uboot/lib/copy.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/uboot/lib/devicename.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/uboot/lib/disk.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/uboot/lib/elf_freebsd.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/uboot/lib/glue.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/uboot/lib/glue.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/uboot/lib/libuboot.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/uboot/lib/module.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/uboot/lib/net.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/uboot/lib/reboot.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/uboot/lib/time.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/cam/scsi/scsi_ses.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/kern/opensolaris_kstat.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/kern/opensolaris_string.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/kern/opensolaris_zone.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/machine/endian.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/rpc/xdr.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/acl.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/atomic.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/bitmap.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/byteorder.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/callb.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/cmn_err.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/cpupart.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/cpuvar.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/cred.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/cyclic.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/debug.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/dirent.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/dkio.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/dnlc.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/elf.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/kcondvar.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/kmem.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/kobj.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/kstat.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/lock.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/misc.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/mman.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/mntent.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/mnttab.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/modctl.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/mount.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/mutex.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/objfs.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/param.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/pcpu.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/policy.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/proc.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/random.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/rwlock.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/sdt.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/stat.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/string.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/sunddi.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/sysmacros.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/systm.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/taskq.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/taskq_impl.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/time.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/types.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/uio.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/varargs.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/vfs.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/vnode.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/zone.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/common/atomic/i386/atomic.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/common/atomic/ia64/atomic.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/common/avl/avl.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/Makefile.files#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bplist.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/gzip.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sha256.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/unique.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/os/callb.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/os/list.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/os/taskq.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_array.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_mem.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/sys/asm_linkage.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/sys/avl_impl.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/sys/bitmap.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/sys/byteorder.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/sys/callb.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/sys/ccompile.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/sys/compress.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/sys/cred.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/sys/dkio.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/sys/dklabel.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/sys/errorq.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/sys/feature_tests.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/sys/fm/protocol.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/sys/fm/util.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/sys/gfs.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/sys/list.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/sys/list_impl.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/sys/note.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair_impl.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/sys/processor.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/sys/procset.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/sys/sdt.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/sys/synch.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/sys/vmem.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/sys/zmod.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/zmod/adler32.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/zmod/deflate.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/zmod/deflate.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inffast.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inffast.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inffixed.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inflate.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inflate.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inftrees.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inftrees.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/zmod/trees.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zconf.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zlib.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod_subr.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zutil.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zutil.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/freebsd32/freebsd32_misc.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linprocfs/linprocfs.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linux/linux_file.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linux/linux_futex.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linux/linux_futex.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linux/linux_misc.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linux/linux_uid16.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linux/linux_util.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/kern/opensolaris_atomic.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/kern/opensolaris_kmem.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/kern/opensolaris_kobj.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/kern/opensolaris_kstat.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/kern/opensolaris_misc.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/kern/opensolaris_policy.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/kern/opensolaris_string.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/kern/opensolaris_vfs.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/kern/opensolaris_zone.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/machine/endian.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/rpc/xdr.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/sys/acl.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/sys/atomic.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/sys/bitmap.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/sys/byteorder.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/sys/callb.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/sys/cmn_err.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/sys/cpupart.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/sys/cpuvar.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/sys/cred.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/sys/cyclic.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/sys/debug.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/sys/dirent.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/sys/dkio.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/sys/dnlc.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/sys/elf.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/sys/kcondvar.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/sys/kmem.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/sys/kobj.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/sys/kstat.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/sys/lock.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/sys/misc.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/sys/mman.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/sys/mntent.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/sys/mnttab.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/sys/modctl.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/sys/mount.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/sys/mutex.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/sys/objfs.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/sys/param.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/sys/pcpu.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/sys/policy.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/sys/proc.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/sys/random.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/sys/rwlock.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/sys/sdt.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/sys/stat.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/sys/string.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/sys/sunddi.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/sys/sysmacros.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/sys/systm.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/sys/taskq.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/sys/taskq_impl.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/sys/time.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/sys/types.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/sys/uio.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/sys/varargs.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/sys/vfs.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/sys/vnode.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/sys/zone.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/pecoff/imgact_pecoff.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/svr4/svr4_fcntl.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/svr4/svr4_sysvec.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/conf/NOTES#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/conf/files#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/conf/kmod.mk#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/conf/options#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/conf/options.amd64#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/conf/options.i386#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/conf/options.pc98#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/OPENSOLARIS.LICENSE#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/common/acl/acl_common.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/common/acl/acl_common.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/common/atomic/i386/atomic.S#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/common/atomic/ia64/atomic.S#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/common/avl/avl.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/common/nvpair/nvpair.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/common/zfs/zfs_namecheck.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/common/zfs/zfs_namecheck.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/common/zfs/zfs_prop.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/common/zfs/zfs_prop.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/Makefile.files#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/gfs.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/bplist.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/dnode.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/gzip.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/refcount.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/sha256.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/space_map.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/txg.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/unique.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/os/callb.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/os/list.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/os/taskq.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/rpc/xdr.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/rpc/xdr.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/rpc/xdr_array.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/rpc/xdr_mem.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/sys/asm_linkage.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/sys/avl.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/sys/avl_impl.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/sys/bitmap.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/sys/byteorder.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/sys/callb.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/sys/ccompile.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/sys/compress.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/sys/cred.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/sys/debug.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/sys/dkio.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/sys/dklabel.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/sys/errorq.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/sys/feature_tests.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/sys/fm/protocol.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/sys/fm/util.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/sys/fs/zfs.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/sys/gfs.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/sys/list.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/sys/list_impl.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/sys/note.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/sys/nvpair.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/sys/nvpair_impl.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/sys/processor.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/sys/procset.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/sys/sdt.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/sys/synch.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/sys/sysevent.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/sys/vmem.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/sys/zmod.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/zmod/adler32.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/zmod/crc32.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/zmod/crc32.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/zmod/deflate.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/zmod/deflate.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/zmod/inffast.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/zmod/inffast.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/zmod/inffixed.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/zmod/inflate.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/zmod/inflate.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/zmod/inftrees.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/zmod/inftrees.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/zmod/trees.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/zmod/zconf.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/zmod/zlib.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/zmod/zmod.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/zmod/zmod_subr.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/zmod/zutil.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/opensolaris/uts/common/zmod/zutil.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/pf/net/pf_if.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/pf/net/pfvar.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/ddb/db_command.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/ddb/db_examine.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/ddb/db_input.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/ddb/db_ps.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/ddb/ddb.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/aac/aac.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/aac/aac_cam.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/aac/aac_debug.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/aac/aac_disk.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/aac/aac_pci.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/aac/aacreg.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/aac/aacvar.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/acpica/acpi.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/acpica/acpi_cpu.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/acpica/acpivar.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/agp/agp_i810.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/agp/agp_nvidia.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/ata-all.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/ata-all.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/ata-chipset.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/ata-disk.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/ata-disk.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/ata-pci.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/ata-raid.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ath/if_ath.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/bge/if_bge.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cmx/cmx.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cmx/cmx_pccard.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cmx/cmxreg.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cmx/cmxvar.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cpufreq/ichss.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/common/cxgb_ael1002.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/common/cxgb_common.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/common/cxgb_version.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/cxgb_adapter.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/cxgb_ioctl.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/cxgb_main.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/cxgb_offload.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/cxgb_sge.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/sys/cxgb_support.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/tom/cxgb_defs.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/dc/if_dc.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/dc/if_dcreg.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/drm_pciids.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/i915_dma.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_80003es2lan.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_82540.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_82541.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_82542.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_82543.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_82571.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_82571.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_api.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_api.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_defines.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_hw.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_ich8lan.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_ich8lan.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_mac.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_mac.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_manage.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_nvm.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_nvm.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_osdep.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_osdep.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_phy.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_phy.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/if_em.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/if_em.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/en/midway.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/fatm/if_fatm.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/firewire/if_fwe.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/firewire/if_fwip.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/fxp/if_fxp.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/gem/if_gem.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/gem/if_gem_pci.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/gem/if_gemreg.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/gem/if_gemvar.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/hptrr/hptrr_os_bsd.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/hptrr/hptrr_osm_bsd.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/hptrr/ldm.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/hptrr/osm.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/hwpmc/hwpmc_amd.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/hwpmc/pmc_events.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/igb/e1000_mac.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/igb/e1000_osdep.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/igb/if_igb.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/iscsi/initiator/isc_soc.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/lge/if_lge.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/malo/if_malo.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/malo/if_malo.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/malo/if_malo_pci.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/malo/if_malohal.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/malo/if_malohal.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/malo/if_maloioctl.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mfi/mfi.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mii/brgphy.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mii/miidevs#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mii/rgephy.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mpt/mpt.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/msk/if_msk.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mxge/if_mxge.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/nfe/if_nfe.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/nfe/if_nfereg.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/nfe/if_nfevar.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ofw/ofw_console.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/pccard/pccarddevs#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/re/if_re.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/speaker/spkr.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/syscons/syscons.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/syscons/sysmouse.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/tdfx/tdfx_pci.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ti/if_ti.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/tsec/if_tsec.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/tsec/if_tsec.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/uart/uart.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/uart/uart_dev_ns8250.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/ehci.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/ehci_pci.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/if_axe.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/if_rum.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/if_zyd.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/ohci.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/ubsa.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/ucom.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/ucomvar.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/ums.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/usb_quirks.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/usbdevs#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/usbdi.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/usbdi.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/usbdivar.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/uslcom.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/vr/if_vr.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/vr/if_vrreg.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/wpi/if_wpi.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/wpi/if_wpireg.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/wpi/if_wpivar.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/coda/coda_vfsops.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/devfs/devfs_rule.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/fifofs/fifo_vnops.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/msdosfs/msdosfs_vnops.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/nullfs/null_subr.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/nullfs/null_vfsops.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/procfs/procfs_ctl.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/procfs/procfs_dbregs.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/procfs/procfs_status.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/tmpfs/tmpfs_vnops.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/unionfs/union_vfsops.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/gdb/gdb_cons.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/geom/geom.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/geom/geom_subr.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/geom/part/g_part.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/geom/part/g_part.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/geom/part/g_part_apm.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/geom/part/g_part_bsd.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/geom/part/g_part_gpt.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/geom/part/g_part_mbr.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/geom/part/g_part_pc98.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/geom/part/g_part_vtoc8.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/geom/vinum/geom_vinum_drive.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/acpica/acpi_machdep.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/acpica/acpi_wakeup.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/acpica/madt.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/conf/DEFAULTS#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/conf/GENERIC#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/conf/NOTES#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/conf/XBOX#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/cpufreq/est.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/cpufreq/p4tcc.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/i386/busdma_machdep.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/i386/i686_mem.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/i386/intr_machdep.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/i386/k6_mem.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/i386/legacy.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/i386/local_apic.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/i386/machdep.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/i386/mp_machdep.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/i386/mptable.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/i386/nexus.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/i386/pmap.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/i386/sys_machdep.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/i386/trap.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/i386/vm_machdep.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/ibcs2/ibcs2_fcntl.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/ibcs2/ibcs2_util.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/ibcs2/imgact_coff.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/include/_types.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/include/atomic.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/include/clock.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/include/float.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/include/intr_machdep.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/include/nexusvar.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/include/param.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/include/pmap.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/include/specialreg.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/include/timerreg.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/include/vmparam.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/isa/atpic.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/isa/clock.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/isa/prof_machdep.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/isa/vesa.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/linux/linux_proto.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/linux/linux_syscall.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/linux/linux_sysent.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/linux/linux_sysvec.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/linux/syscalls.master#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/svr4/svr4_machdep.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/xbox/xbox.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/ia64/conf/DEFAULTS#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/ia64/conf/GENERIC#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/ia64/ia64/elf_machdep.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/ia64/ia64/interrupt.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/ia64/ia64/machdep.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/ia64/ia64/nexus.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/ia64/ia64/pmap.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/ia64/ia64/sscdisk.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/ia64/ia64/trap.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/ia64/include/atomic.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/ia64/include/clock.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/ia64/include/md_var.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/ia64/include/param.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/ia64/include/ucontext.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/ia64/isa/isa_dma.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/isa/syscons_isa.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/bus_if.m#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/imgact_elf.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/init_main.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/init_sysent.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_alq.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_clock.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_condvar.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_conf.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_cpuset.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_descrip.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_event.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_exec.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_exit.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_fork.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_idle.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_intr.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_jail.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_kse.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_kthread.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_linker.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_lockf.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_malloc.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_mbuf.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_module.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_ntptime.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_poll.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_priv.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_proc.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_resource.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_rwlock.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_shutdown.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_sig.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_switch.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_sx.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_synch.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_tc.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_thr.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_thread.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_timeout.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_umtx.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/link_elf.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/link_elf_obj.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/makesyscalls.sh#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/p1003_1b.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/sched_4bsd.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/sched_ule.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/subr_autoconf.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/subr_bus.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/subr_eventhandler.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/subr_log.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/subr_mchain.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/subr_prof.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/subr_sleepqueue.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/subr_smp.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/subr_taskqueue.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/subr_trap.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/subr_witness.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/sys_generic.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/sys_process.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/syscalls.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/syscalls.master#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/systrace_args.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/tty.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/tty_cons.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/tty_pts.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/tty_pty.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/tty_subr.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/tty_tty.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/uipc_domain.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/uipc_mbuf.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/uipc_mqueue.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/uipc_socket.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/uipc_syscalls.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/vfs_acl.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/vfs_bio.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/vfs_cache.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/vfs_cluster.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/vfs_default.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/vfs_extattr.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/vfs_hash.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/vfs_lookup.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/vfs_mount.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/vfs_subr.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/vfs_syscalls.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/vfs_vnops.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/vnode_if.src#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/Makefile#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/bktr/bktr/Makefile#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/cmx/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/em/Makefile#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/geom/geom_part/Makefile#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/geom/geom_part/geom_part_apm/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/geom/geom_part/geom_part_bsd/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/geom/geom_part/geom_part_gpt/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/geom/geom_part/geom_part_mbr/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/geom/geom_part/geom_part_pc98/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/geom/geom_part/geom_part_vtoc8/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/igb/Makefile#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/ixgbe/Makefile#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/krpc/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/malo/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/nfslockd/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/sound/driver/emu10kx/Makefile#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/uslcom/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/vr/Makefile#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/wpi/Makefile#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/zfs/Makefile#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/bpf.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/bpf.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/bpf_buffer.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/net/bpf_buffer.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/net/bpf_filter.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/bpf_zerocopy.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/net/bpf_zerocopy.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/net/bpfdesc.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/ieee8023ad_lacp.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/ieee8023ad_lacp.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/if.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/if.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/if_ef.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/if_enc.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/if_ethersubr.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/if_fddisubr.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/if_gif.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/if_gre.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/if_iso88025subr.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/if_lagg.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/if_loop.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/if_media.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/if_sl.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/if_var.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/netisr.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/raw_cb.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/rtsock.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netatalk/aarp.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netatm/ipatm/ipatm_load.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netatm/port.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netatm/sigpvc/sigpvc_if.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netatm/spans/spans_if.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netatm/uni/uni_load.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/netgraph.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_base.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_car.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_ksocket.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_l2tp.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_pptpgre.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_pptpgre.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_socket.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_tee.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/in.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/in_pcb.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/in_pcb.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/ip_fw2.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/ip_ipsec.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Apr 3 13:46:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF9D31065671; Thu, 3 Apr 2008 13:46:37 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B22C0106566B for ; Thu, 3 Apr 2008 13:46:37 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9CB7F8FC0C for ; Thu, 3 Apr 2008 13:46:37 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m33DkbgB074107 for ; Thu, 3 Apr 2008 13:46:37 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m33DkbkZ074105 for perforce@freebsd.org; Thu, 3 Apr 2008 13:46:37 GMT (envelope-from gonzo@FreeBSD.org) Date: Thu, 3 Apr 2008 13:46:37 GMT Message-Id: <200804031346.m33DkbkZ074105@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 139265 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Apr 2008 13:46:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=139265 Change 139265 by gonzo@gonzo_jeeves on 2008/04/03 13:46:14 o conform new intr_event_add_handler API. Add bogus mask/unmask functions. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/idt/obio.c#2 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/idt/obio.c#2 (text+ko) ==== @@ -259,7 +259,9 @@ event = sc->sc_eventstab[irq]; if (event == NULL) { error = intr_event_create(&event, (void *)irq, 0, - (void (*)(void *))NULL, "obio intr%d:", irq); + (mask_fn)mips_mask_irq, (mask_fn)mips_unmask_irq, + NULL, NULL, + "obio intr%d:", irq); sc->sc_eventstab[irq] = event; } From owner-p4-projects@FreeBSD.ORG Thu Apr 3 16:23:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 876D71065678; Thu, 3 Apr 2008 16:23:26 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 49A681065675 for ; Thu, 3 Apr 2008 16:23:26 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 33E158FC20 for ; Thu, 3 Apr 2008 16:23:26 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m33GNQ0l085074 for ; Thu, 3 Apr 2008 16:23:26 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m33GNQEp085072 for perforce@freebsd.org; Thu, 3 Apr 2008 16:23:26 GMT (envelope-from sam@freebsd.org) Date: Thu, 3 Apr 2008 16:23:26 GMT Message-Id: <200804031623.m33GNQEp085072@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 139270 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Apr 2008 16:23:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=139270 Change 139270 by sam@sam_ebb on 2008/04/03 16:23:11 defer net80211 state machine callbacks from interrupt context to taskqueue_swi to eliminate LOR's Affected files ... .. //depot/projects/vap/sys/dev/wi/if_wi.c#23 edit .. //depot/projects/vap/sys/dev/wi/if_wivar.h#15 edit Differences ... ==== //depot/projects/vap/sys/dev/wi/if_wi.c#23 (text+ko) ==== @@ -78,6 +78,7 @@ #include #include #include +#include #include #include @@ -131,6 +132,11 @@ static void wi_rx_intr(struct wi_softc *); static void wi_tx_intr(struct wi_softc *); static void wi_tx_ex_intr(struct wi_softc *); + +static void wi_status_connected(void *, int); +static void wi_status_disconnected(void *, int); +static void wi_status_oor(void *, int); +static void wi_status_assoc_failed(void *, int); static void wi_info_intr(struct wi_softc *); static int wi_write_txrate(struct wi_softc *, struct ieee80211vap *); @@ -431,6 +437,7 @@ } sc->sc_portnum = WI_DEFAULT_PORT; + TASK_INIT(&sc->sc_oor_task, 0, wi_status_oor, ic); ieee80211_ifattach(ic); ic->ic_raw_xmit = wi_raw_xmit; @@ -506,6 +513,7 @@ M_80211_VAP, M_NOWAIT | M_ZERO); if (wvp == NULL) return NULL; + vap = &wvp->wv_vap; ieee80211_vap_setup(ic, vap, name, unit, opmode, flags, bssid, mac); @@ -540,6 +548,10 @@ break; } + TASK_INIT(&wvp->wv_connected_task, 0, wi_status_connected, vap); + TASK_INIT(&wvp->wv_disconnected_task, 0, wi_status_disconnected, vap); + TASK_INIT(&wvp->wv_assoc_failed_task, 0, wi_status_assoc_failed, vap); + /* complete setup */ ieee80211_vap_attach(vap, ieee80211_media_change, wi_media_status); ic->ic_opmode = opmode; @@ -1447,11 +1459,52 @@ } } +static void +wi_status_connected(void *arg, int pending) +{ + struct ieee80211vap *vap = arg; + struct ieee80211com *ic = vap->iv_ic; + + IEEE80211_LOCK(ic); + WI_VAP(vap)->wv_newstate(vap, IEEE80211_S_RUN, 0); + if (vap->iv_newstate_cb != NULL) + vap->iv_newstate_cb(vap, IEEE80211_S_RUN, 0); + IEEE80211_UNLOCK(ic); +} + +static void +wi_status_disconnected(void *arg, int pending) +{ + struct ieee80211vap *vap = arg; + + if (vap->iv_state == IEEE80211_S_RUN) { + vap->iv_stats.is_rx_deauth++; + ieee80211_new_state(vap, IEEE80211_S_SCAN, 0); + } +} + +static void +wi_status_oor(void *arg, int pending) +{ + struct ieee80211com *ic = arg; + + ieee80211_beacon_miss(ic); +} + +static void +wi_status_assoc_failed(void *arg, int pending) +{ + struct ieee80211vap *vap = arg; + + ieee80211_new_state(vap, IEEE80211_S_SCAN, IEEE80211_SCAN_FAIL_TIMEOUT); +} + static __noinline void wi_info_intr(struct wi_softc *sc) { struct ieee80211com *ic = &sc->sc_ic; struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps); + struct wi_vap *wvp = WI_VAP(vap); struct ifnet *ifp = sc->sc_ifp; int i, fid, len, off; u_int16_t ltbuf[2]; @@ -1472,28 +1525,22 @@ break; /* fall thru... */ case WI_INFO_LINK_STAT_AP_CHG: - IEEE80211_LOCK(ic); - WI_VAP(vap)->wv_newstate(vap, IEEE80211_S_RUN, 0); - if (vap->iv_newstate_cb != NULL) - vap->iv_newstate_cb(vap, IEEE80211_S_RUN, 0); - IEEE80211_UNLOCK(ic); + taskqueue_enqueue(taskqueue_swi, &wvp->wv_connected_task); break; case WI_INFO_LINK_STAT_AP_INR: break; case WI_INFO_LINK_STAT_DISCONNECTED: /* we dropped off the net; e.g. due to deauth/disassoc */ - if (vap->iv_state == IEEE80211_S_RUN) { - vap->iv_stats.is_rx_deauth++; - ieee80211_new_state(vap, IEEE80211_S_SCAN, 0); - } + taskqueue_enqueue(taskqueue_swi, &wvp->wv_disconnected_task); break; case WI_INFO_LINK_STAT_AP_OOR: - ieee80211_beacon_miss(ic); + /* XXX does this need to be per-vap? */ + taskqueue_enqueue(taskqueue_swi, &sc->sc_oor_task); break; case WI_INFO_LINK_STAT_ASSOC_FAILED: if (vap->iv_opmode == IEEE80211_M_STA) - ieee80211_new_state(vap, IEEE80211_S_SCAN, - IEEE80211_SCAN_FAIL_TIMEOUT); + taskqueue_enqueue(taskqueue_swi, + &wvp->wv_assoc_failed_task); break; } break; ==== //depot/projects/vap/sys/dev/wi/if_wivar.h#15 (text+ko) ==== @@ -59,6 +59,9 @@ struct wi_vap { struct ieee80211vap wv_vap; struct ieee80211_beacon_offsets wv_bo; + struct task wv_connected_task; + struct task wv_disconnected_task; + struct task wv_assoc_failed_task; void (*wv_recv_mgmt)(struct ieee80211_node *, struct mbuf *, int, int, int, u_int32_t); @@ -73,6 +76,7 @@ device_t sc_dev; struct mtx sc_mtx; struct callout sc_watchdog; + struct task sc_oor_task; int sc_unit; int wi_gone; int sc_enabled; From owner-p4-projects@FreeBSD.ORG Thu Apr 3 16:23:27 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE20B1065719; Thu, 3 Apr 2008 16:23:26 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6C3401065676 for ; Thu, 3 Apr 2008 16:23:26 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 56F678FC25 for ; Thu, 3 Apr 2008 16:23:26 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m33GNQnH085079 for ; Thu, 3 Apr 2008 16:23:26 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m33GNQdb085077 for perforce@freebsd.org; Thu, 3 Apr 2008 16:23:26 GMT (envelope-from thompsa@freebsd.org) Date: Thu, 3 Apr 2008 16:23:26 GMT Message-Id: <200804031623.m33GNQdb085077@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 139271 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Apr 2008 16:23:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=139271 Change 139271 by thompsa@thompsa_burger on 2008/04/03 16:23:13 Use function callbacks passed to us. Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211.c#35 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211.c#35 (text+ko) ==== @@ -955,7 +955,7 @@ * the set of available modes. */ maxrate = ieee80211_media_setup(ic, &ic->ic_media, ic->ic_caps, 1, - ieee80211com_media_change, ieee80211com_media_status); + media_change, media_stat); /* NB: strip explicit mode; we're actually in autoselect */ ifmedia_set(&ic->ic_media, media_status(ic->ic_opmode, ic->ic_curchan) &~ IFM_MMASK); From owner-p4-projects@FreeBSD.ORG Thu Apr 3 16:38:43 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 02F05106566C; Thu, 3 Apr 2008 16:38:43 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B8D42106564A for ; Thu, 3 Apr 2008 16:38:42 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A334F8FC2B for ; Thu, 3 Apr 2008 16:38:42 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m33GcgVL085514 for ; Thu, 3 Apr 2008 16:38:42 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m33GcgTt085512 for perforce@freebsd.org; Thu, 3 Apr 2008 16:38:42 GMT (envelope-from thompsa@freebsd.org) Date: Thu, 3 Apr 2008 16:38:42 GMT Message-Id: <200804031638.m33GcgTt085512@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 139272 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Apr 2008 16:38:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=139272 Change 139272 by thompsa@thompsa_burger on 2008/04/03 16:37:53 Set the default opmode or we panic with an unknown media type on ifmedia_set(). Affected files ... .. //depot/projects/vap/sys/dev/wpi/if_wpi.c#13 edit Differences ... ==== //depot/projects/vap/sys/dev/wpi/if_wpi.c#13 (text+ko) ==== @@ -614,7 +614,8 @@ } ic->ic_ifp = ifp; - ic->ic_phytype = IEEE80211_T_OFDM; /* not only, but not used */ + ic->ic_phytype = IEEE80211_T_OFDM; /* not only, but not used */ + ic->ic_opmode = IEEE80211_M_STA; /* default to BSS mode */ /* set device capabilities */ ic->ic_caps = From owner-p4-projects@FreeBSD.ORG Thu Apr 3 17:09:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 759881065672; Thu, 3 Apr 2008 17:09:15 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 381901065670 for ; Thu, 3 Apr 2008 17:09:15 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 22CB78FC19 for ; Thu, 3 Apr 2008 17:09:15 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m33H9F0r096847 for ; Thu, 3 Apr 2008 17:09:15 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m33H9EEj096845 for perforce@freebsd.org; Thu, 3 Apr 2008 17:09:14 GMT (envelope-from sam@freebsd.org) Date: Thu, 3 Apr 2008 17:09:14 GMT Message-Id: <200804031709.m33H9EEj096845@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 139275 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Apr 2008 17:09:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=139275 Change 139275 by sam@sam_ebb on 2008/04/03 17:08:20 eliminate recursive locking through if_start Affected files ... .. //depot/projects/vap/sys/dev/ral/rt2560.c#22 edit .. //depot/projects/vap/sys/dev/ral/rt2560var.h#14 edit .. //depot/projects/vap/sys/dev/ral/rt2661.c#19 edit Differences ... ==== //depot/projects/vap/sys/dev/ral/rt2560.c#22 (text) ==== @@ -130,6 +130,7 @@ struct ieee80211_node *); static int rt2560_tx_data(struct rt2560_softc *, struct mbuf *, struct ieee80211_node *); +static void rt2560_start_locked(struct ifnet *); static void rt2560_start(struct ifnet *); static void rt2560_watchdog(void *); static int rt2560_ioctl(struct ifnet *, u_long, caddr_t); @@ -1045,7 +1046,7 @@ if ((sc->sc_flags & (RT2560_F_DATA_OACTIVE | RT2560_F_PRIO_OACTIVE)) == 0) ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; - rt2560_start(ifp); + rt2560_start_locked(ifp); } } @@ -1130,7 +1131,7 @@ if ((sc->sc_flags & (RT2560_F_DATA_OACTIVE | RT2560_F_PRIO_OACTIVE)) == 0) ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; - rt2560_start(ifp); + rt2560_start_locked(ifp); } } @@ -1923,13 +1924,13 @@ } static void -rt2560_start(struct ifnet *ifp) +rt2560_start_locked(struct ifnet *ifp) { struct rt2560_softc *sc = ifp->if_softc; struct mbuf *m; struct ieee80211_node *ni; - RAL_LOCK(sc); + RAL_LOCK_ASSERT(sc); for (;;) { IFQ_DRV_DEQUEUE(&ifp->if_snd, m); @@ -1958,7 +1959,15 @@ sc->sc_tx_timer = 5; } +} + +static void +rt2560_start(struct ifnet *ifp) +{ + struct rt2560_softc *sc = ifp->if_softc; + RAL_LOCK(sc); + rt2560_start_locked(ifp); RAL_UNLOCK(sc); } ==== //depot/projects/vap/sys/dev/ral/rt2560var.h#14 (text) ==== @@ -171,5 +171,6 @@ void rt2560_resume(void *); void rt2560_intr(void *); -#define RAL_LOCK(sc) mtx_lock(&(sc)->sc_mtx) -#define RAL_UNLOCK(sc) mtx_unlock(&(sc)->sc_mtx) +#define RAL_LOCK(sc) mtx_lock(&(sc)->sc_mtx) +#define RAL_LOCK_ASSERT(sc) mtx_assert(&(sc)->sc_mtx, MA_OWNED) +#define RAL_UNLOCK(sc) mtx_unlock(&(sc)->sc_mtx) ==== //depot/projects/vap/sys/dev/ral/rt2661.c#19 (text) ==== @@ -124,6 +124,7 @@ struct ieee80211_node *, int); static int rt2661_tx_mgt(struct rt2661_softc *, struct mbuf *, struct ieee80211_node *); +static void rt2661_start_locked(struct ifnet *); static void rt2661_start(struct ifnet *); static int rt2661_raw_xmit(struct ieee80211_node *, struct mbuf *, const struct ieee80211_bpf_params *); @@ -977,7 +978,8 @@ sc->sc_tx_timer = 0; ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; - rt2661_start(ifp); + + rt2661_start_locked(ifp); } static void @@ -1614,20 +1616,18 @@ } static void -rt2661_start(struct ifnet *ifp) +rt2661_start_locked(struct ifnet *ifp) { struct rt2661_softc *sc = ifp->if_softc; struct mbuf *m; struct ieee80211_node *ni; int ac; - RAL_LOCK(sc); + RAL_LOCK_ASSERT(sc); /* prevent management frames from being sent if we're not ready */ - if (!(ifp->if_drv_flags & IFF_DRV_RUNNING) || sc->sc_invalid) { - RAL_UNLOCK(sc); + if (!(ifp->if_drv_flags & IFF_DRV_RUNNING) || sc->sc_invalid) return; - } for (;;) { IFQ_DRV_DEQUEUE(&ifp->if_snd, m); @@ -1659,7 +1659,15 @@ sc->sc_tx_timer = 5; callout_reset(&sc->watchdog_ch, hz, rt2661_watchdog, sc); } +} + +static void +rt2661_start(struct ifnet *ifp) +{ + struct rt2661_softc *sc = ifp->if_softc; + RAL_LOCK(sc); + rt2661_start_locked(ifp); RAL_UNLOCK(sc); } From owner-p4-projects@FreeBSD.ORG Thu Apr 3 17:14:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D3B3C106567D; Thu, 3 Apr 2008 17:14:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 965B81065678 for ; Thu, 3 Apr 2008 17:14:20 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 816878FC12 for ; Thu, 3 Apr 2008 17:14:20 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m33HEKDh097005 for ; Thu, 3 Apr 2008 17:14:20 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m33HEKav097003 for perforce@freebsd.org; Thu, 3 Apr 2008 17:14:20 GMT (envelope-from sam@freebsd.org) Date: Thu, 3 Apr 2008 17:14:20 GMT Message-Id: <200804031714.m33HEKav097003@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 139276 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Apr 2008 17:14:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=139276 Change 139276 by sam@sam_ebb on 2008/04/03 17:14:09 hookup promisc mode update callback Affected files ... .. //depot/projects/vap/sys/dev/ral/rt2560.c#23 edit .. //depot/projects/vap/sys/dev/ral/rt2661.c#20 edit Differences ... ==== //depot/projects/vap/sys/dev/ral/rt2560.c#23 (text) ==== @@ -152,7 +152,7 @@ static void rt2560_set_bssid(struct rt2560_softc *, const uint8_t *); static void rt2560_set_macaddr(struct rt2560_softc *, uint8_t *); static void rt2560_get_macaddr(struct rt2560_softc *, uint8_t *); -static void rt2560_update_promisc(struct rt2560_softc *); +static void rt2560_update_promisc(struct ifnet *); static const char *rt2560_get_rf(int); static void rt2560_read_config(struct rt2560_softc *); static int rt2560_bbp_init(struct rt2560_softc *); @@ -300,6 +300,7 @@ ic->ic_newassoc = rt2560_newassoc; ic->ic_raw_xmit = rt2560_raw_xmit; ic->ic_updateslot = rt2560_update_slot; + ic->ic_update_promisc = rt2560_update_promisc; ic->ic_node_alloc = rt2560_node_alloc; ic->ic_scan_start = rt2560_scan_start; ic->ic_scan_end = rt2560_scan_end; @@ -2008,7 +2009,7 @@ if (ifp->if_flags & IFF_UP) { RAL_LOCK(sc); if (ifp->if_drv_flags & IFF_DRV_RUNNING) - rt2560_update_promisc(sc); + rt2560_update_promisc(ifp); else rt2560_init(sc); RAL_UNLOCK(sc); @@ -2433,9 +2434,9 @@ } static void -rt2560_update_promisc(struct rt2560_softc *sc) +rt2560_update_promisc(struct ifnet *ifp) { - struct ifnet *ifp = sc->sc_ic.ic_ifp; + struct rt2560_softc *sc = ifp->if_softc; uint32_t tmp; tmp = RAL_READ(sc, RT2560_RXCSR0); ==== //depot/projects/vap/sys/dev/ral/rt2661.c#20 (text) ==== @@ -150,7 +150,7 @@ const uint8_t *); static void rt2661_set_macaddr(struct rt2661_softc *, const uint8_t *); -static void rt2661_update_promisc(struct rt2661_softc *); +static void rt2661_update_promisc(struct ifnet *); static int rt2661_wme_update(struct ieee80211com *) __unused; static void rt2661_update_slot(struct ifnet *); static const char *rt2661_get_rf(int); @@ -310,6 +310,7 @@ ic->ic_scan_end = rt2661_scan_end; ic->ic_set_channel = rt2661_set_channel; ic->ic_updateslot = rt2661_update_slot; + ic->ic_update_promisc = rt2661_update_promisc; ic->ic_raw_xmit = rt2661_raw_xmit; ic->ic_vap_create = rt2661_vap_create; @@ -1746,7 +1747,7 @@ case SIOCSIFFLAGS: if (ifp->if_flags & IFF_UP) { if (ifp->if_drv_flags & IFF_DRV_RUNNING) - rt2661_update_promisc(sc); + rt2661_update_promisc(ifp); else rt2661_init(sc); } else { @@ -2090,9 +2091,9 @@ } static void -rt2661_update_promisc(struct rt2661_softc *sc) +rt2661_update_promisc(struct ifnet *ifp) { - struct ifnet *ifp = sc->sc_ic.ic_ifp; + struct rt2661_softc *sc = ifp->if_softc; uint32_t tmp; tmp = RAL_READ(sc, RT2661_TXRX_CSR0); From owner-p4-projects@FreeBSD.ORG Thu Apr 3 17:33:40 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 963131065674; Thu, 3 Apr 2008 17:33:40 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 585CF1065670 for ; Thu, 3 Apr 2008 17:33:40 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 29DA18FC0A for ; Thu, 3 Apr 2008 17:33:40 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m33HXeDU097572 for ; Thu, 3 Apr 2008 17:33:40 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m33HXeMl097570 for perforce@freebsd.org; Thu, 3 Apr 2008 17:33:40 GMT (envelope-from sam@freebsd.org) Date: Thu, 3 Apr 2008 17:33:40 GMT Message-Id: <200804031733.m33HXeMl097570@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 139277 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Apr 2008 17:33:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=139277 Change 139277 by sam@sam_ebb on 2008/04/03 17:33:07 the state change SLEEP->RUN may not happen directly; return until the state machine calls back again Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_output.c#45 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_output.c#45 (text+ko) ==== @@ -116,6 +116,7 @@ * In power save, wakeup device for transmit. */ ieee80211_new_state(vap, IEEE80211_S_RUN, 0); + return; } /* * No data frames go out unless we're running. From owner-p4-projects@FreeBSD.ORG Thu Apr 3 17:44:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 987A91065672; Thu, 3 Apr 2008 17:44:53 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5A898106566C for ; Thu, 3 Apr 2008 17:44:53 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 459DB8FC1B for ; Thu, 3 Apr 2008 17:44:53 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m33Hirnf097949 for ; Thu, 3 Apr 2008 17:44:53 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m33HirrD097947 for perforce@freebsd.org; Thu, 3 Apr 2008 17:44:53 GMT (envelope-from sam@freebsd.org) Date: Thu, 3 Apr 2008 17:44:53 GMT Message-Id: <200804031744.m33HirrD097947@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 139279 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Apr 2008 17:44:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=139279 Change 139279 by sam@sam_ebb on 2008/04/03 17:44:13 mark the vap OACTIVE under the com lock to close a race against the state machine Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_output.c#46 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_output.c#46 (text+ko) ==== @@ -125,12 +125,18 @@ * for CSA). */ if (vap->iv_state != IEEE80211_S_RUN) { - IEEE80211_DPRINTF(vap, IEEE80211_MSG_OUTPUT, - "%s: ignore queue, in %s state\n", - __func__, ieee80211_state_name[vap->iv_state]); - vap->iv_stats.is_tx_badstate++; - ifp->if_drv_flags |= IFF_DRV_OACTIVE; - return; + IEEE80211_LOCK(ic); + /* re-check under the com lock to avoid races */ + if (vap->iv_state != IEEE80211_S_RUN) { + IEEE80211_DPRINTF(vap, IEEE80211_MSG_OUTPUT, + "%s: ignore queue, in %s state\n", + __func__, ieee80211_state_name[vap->iv_state]); + vap->iv_stats.is_tx_badstate++; + ifp->if_drv_flags |= IFF_DRV_OACTIVE; + IEEE80211_UNLOCK(ic); + return; + } + IEEE80211_UNLOCK(ic); } for (;;) { IFQ_DEQUEUE(&ifp->if_snd, m); From owner-p4-projects@FreeBSD.ORG Thu Apr 3 17:58:10 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2652F106566B; Thu, 3 Apr 2008 17:58:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DC1781065673 for ; Thu, 3 Apr 2008 17:58:09 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id ADC088FC13 for ; Thu, 3 Apr 2008 17:58:09 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m33Hw90a098357 for ; Thu, 3 Apr 2008 17:58:09 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m33Hw9I9098355 for perforce@freebsd.org; Thu, 3 Apr 2008 17:58:09 GMT (envelope-from sam@freebsd.org) Date: Thu, 3 Apr 2008 17:58:09 GMT Message-Id: <200804031758.m33Hw9I9098355@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 139280 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Apr 2008 17:58:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=139280 Change 139280 by sam@sam_ebb on 2008/04/03 17:58:00 expand com lock around ic_update_mcast callback to be consistent with other use and to maintain lock order of com lock > driver lock Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#52 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#52 (text+ko) ==== @@ -3100,9 +3100,9 @@ (void) if_addmulti(parent, ifma->ifma_addr, NULL); } parent->if_ioctl = ioctl; - IEEE80211_UNLOCK(ic); ic->ic_update_mcast(ic->ic_ifp); + IEEE80211_UNLOCK(ic); } int From owner-p4-projects@FreeBSD.ORG Thu Apr 3 18:01:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 829E31065675; Thu, 3 Apr 2008 18:01:13 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 445E81065671 for ; Thu, 3 Apr 2008 18:01:13 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2F6F18FC1E for ; Thu, 3 Apr 2008 18:01:13 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m33I1DqR098468 for ; Thu, 3 Apr 2008 18:01:13 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m33I1DEp098466 for perforce@freebsd.org; Thu, 3 Apr 2008 18:01:13 GMT (envelope-from sam@freebsd.org) Date: Thu, 3 Apr 2008 18:01:13 GMT Message-Id: <200804031801.m33I1DEp098466@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 139281 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Apr 2008 18:01:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=139281 Change 139281 by sam@sam_ebb on 2008/04/03 18:00:25 move ENETRESET handling from ieee80211_ioctl to ieee80211_set80211 where it's used; it's no longer necessary to handle issues like media change as we're managing state change push to the driver through iv_reset (otherwise falling back to the state machine) Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#53 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#53 (text+ko) ==== @@ -3067,8 +3067,12 @@ if (error == ERESTART) error = IFNET_IS_UP_RUNNING(vap->iv_ifp) ? vap->iv_reset(vap, ireq->i_type) : 0; - if (error == ENETRESET && !IS_UP_AUTO(vap)) + if (error == ENETRESET) { + /* XXX need to re-think AUTO handling */ + if (IS_UP_AUTO(vap)) + ieee80211_init(vap); error = 0; + } return error; } @@ -3232,15 +3236,5 @@ error = ether_ioctl(ifp, cmd, data); break; } - /* - * The convention is to return ENETRESET when an operation - * requires a complete re-initialization of the device (e.g. - * changing something that affects the association state). - */ - if (error == ENETRESET) { - if (IFNET_IS_UP_RUNNING(ifp)) - ieee80211_init(vap); - error = 0; - } return error; } From owner-p4-projects@FreeBSD.ORG Thu Apr 3 20:18:37 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EE5D11065670; Thu, 3 Apr 2008 20:18:36 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9CA0D106566B for ; Thu, 3 Apr 2008 20:18:36 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 879C38FC17 for ; Thu, 3 Apr 2008 20:18:36 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m33KIasE008288 for ; Thu, 3 Apr 2008 20:18:36 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m33KIaVS008286 for perforce@freebsd.org; Thu, 3 Apr 2008 20:18:36 GMT (envelope-from sam@freebsd.org) Date: Thu, 3 Apr 2008 20:18:36 GMT Message-Id: <200804032018.m33KIaVS008286@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 139287 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Apr 2008 20:18:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=139287 Change 139287 by sam@sam_ebb on 2008/04/03 20:18:32 Use new taskqueue_block/unblock to fix/improve on longstanding issues: o block rx processing during key changes (still a small race but probably acceptable) o bock task q processing on move to INIT state; still have a small race but before we couldn't use taskqueue_drain because we are called with mtx(s) held and that just barfs entirely This still doesn't fix module unload while active on smp machines which may be a different issue (hard to see since the laptop doesn't have a serial port and it just locks up hard). Affected files ... .. //depot/projects/vap/sys/dev/ath/if_ath.c#58 edit Differences ... ==== //depot/projects/vap/sys/dev/ath/if_ath.c#58 (text+ko) ==== @@ -2451,9 +2451,7 @@ struct ath_softc *sc = ifp->if_softc; DPRINTF(sc, ATH_DEBUG_KEYCACHE, "%s:\n", __func__); -#if 0 - tasklet_disable(&sc->sc_rxtq); -#endif + taskqueue_block(sc->sc_tq); IF_LOCK(&ifp->if_snd); /* NB: doesn't block mgmt frames */ } @@ -2465,9 +2463,7 @@ DPRINTF(sc, ATH_DEBUG_KEYCACHE, "%s:\n", __func__); IF_UNLOCK(&ifp->if_snd); -#if 0 - tasklet_enable(&sc->sc_rxtq); -#endif + taskqueue_unblock(sc->sc_tq); } /* @@ -5524,10 +5520,12 @@ * Walk the vap list and check if there any vap's in RUN state. */ static int -ath_isanyrunningvaps(const struct ieee80211vap *this) +ath_isanyrunningvaps(struct ieee80211vap *this) { - const struct ieee80211com *ic = this->iv_ic; - const struct ieee80211vap *vap; + struct ieee80211com *ic = this->iv_ic; + struct ieee80211vap *vap; + + IEEE80211_LOCK_ASSERT(ic); TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next) { if (vap != this && vap->iv_state == IEEE80211_S_RUN) @@ -5568,12 +5566,14 @@ /* * Scanning: turn off beacon miss and don't beacon. * Mark beacon state so when we reach RUN state we'll - * [re]setup beacons. + * [re]setup beacons. Unblock the task q thread so + * deferred interrupt processing is done. */ ath_hal_intrset(ah, sc->sc_imask &~ (HAL_INT_SWBA | HAL_INT_BMISS)); sc->sc_imask &= ~(HAL_INT_SWBA | HAL_INT_BMISS); sc->sc_beacons = 0; + taskqueue_unblock(sc->sc_tq); } ni = vap->iv_bss; @@ -5689,33 +5689,29 @@ sc->sc_halstats.ns_avgrssi = ATH_RSSI_DUMMY_MARKER; sc->sc_halstats.ns_avgtxrssi = ATH_RSSI_DUMMY_MARKER; /* - * Finally, start any timers. + * Finally, start any timers and the task q thread + * (in case we didn't go through SCAN state). */ if (sc->sc_calinterval != 0) { /* start periodic recalibration timer */ callout_reset(&sc->sc_cal_ch, sc->sc_calinterval * hz, ath_calibrate, sc); } + taskqueue_unblock(sc->sc_tq); } else if (nstate == IEEE80211_S_INIT) { /* * If there are no vaps left in RUN state then * shutdown host/driver operation: - * o disable interrupts so we don't rx frames - * o clean any pending items on the task q - * o notify the rate control algorithm + * o disable interrupts + * o disable the task queue thread + * o mark beacon processing as stopped */ if (!ath_isanyrunningvaps(vap)) { sc->sc_imask &= ~(HAL_INT_SWBA | HAL_INT_BMISS); /* disable interrupts */ ath_hal_intrset(ah, sc->sc_imask &~ HAL_INT_GLOBAL); + taskqueue_block(sc->sc_tq); sc->sc_beacons = 0; -#if 0 - /* XXX can't use taskqueue_drain 'cuz we're holding sc_mtx */ - taskqueue_drain(sc->sc_tq, &sc->sc_rxtask); - taskqueue_drain(sc->sc_tq, &sc->sc_rxorntask); - taskqueue_drain(sc->sc_tq, &sc->sc_bmisstask); - taskqueue_drain(sc->sc_tq, &sc->sc_bstucktask); -#endif } } bad: From owner-p4-projects@FreeBSD.ORG Thu Apr 3 20:59:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 079811065670; Thu, 3 Apr 2008 20:59:21 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BD301106566B for ; Thu, 3 Apr 2008 20:59:20 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A82EB8FC27 for ; Thu, 3 Apr 2008 20:59:20 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m33KxKfW027032 for ; Thu, 3 Apr 2008 20:59:20 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m33KxKr8027030 for perforce@freebsd.org; Thu, 3 Apr 2008 20:59:20 GMT (envelope-from sam@freebsd.org) Date: Thu, 3 Apr 2008 20:59:20 GMT Message-Id: <200804032059.m33KxKr8027030@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 139290 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Apr 2008 20:59:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=139290 Change 139290 by sam@sam_ebb on 2008/04/03 20:58:31 Bite the bullet and hold the com lock across driver callbacks to close various races and make state machine locking more sane: o hold the com lock across the ioctl call to mark the parent device up/down; this mostly causes problems for devices that load firmware in their init routine as the filesystem calls used by firwmare(9) malloc memory with M_WAITOK and we have no way, short of dropping the lock inside the driver, to cope (this is really an issue that needs to be resolved in firmware et al) o hold the com lock while locking the vap list to stop all vap's; this is a noop as this routine is currently unused but closes another case of unlocked vap list traversal While here add an assert to ieee80211_new_state_locked. Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_proto.c#27 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_proto.c#27 (text+ko) ==== @@ -1088,10 +1088,7 @@ IEEE80211_MSG_STATE | IEEE80211_MSG_DEBUG, "%s: up parent %s\n", __func__, parent->if_xname); parent->if_flags |= IFF_UP; - /* XXX drop lock */ - IEEE80211_UNLOCK(ic); parent->if_ioctl(parent, SIOCSIFFLAGS, NULL); - IEEE80211_LOCK(ic); } /* * Mark us running. Note that we do this after @@ -1242,14 +1239,15 @@ struct ifnet *parent = ic->ic_ifp; struct ieee80211vap *vap; + IEEE80211_LOCK(ic); /* XXX shouldn't touch driver state */ parent->if_drv_flags &= ~IFF_DRV_RUNNING; - /* XXX locking */ TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next) { struct ifnet *ifp = vap->iv_ifp; if (IFNET_IS_UP_RUNNING(ifp)) /* NB: avoid recursion */ - ieee80211_stop(vap); + ieee80211_stop_locked(vap); } + IEEE80211_UNLOCK(ic); } /* @@ -1540,6 +1538,8 @@ enum ieee80211_state ostate; int nrunning, nscanning, rc; + IEEE80211_LOCK_ASSERT(ic); + nrunning = nscanning = 0; /* XXX can track this state instead of calculating */ TAILQ_FOREACH(vp, &ic->ic_vaps, iv_next) { From owner-p4-projects@FreeBSD.ORG Thu Apr 3 21:04:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6771E1065674; Thu, 3 Apr 2008 21:04:26 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2A304106564A for ; Thu, 3 Apr 2008 21:04:26 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1511C8FC1C for ; Thu, 3 Apr 2008 21:04:26 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m33L4Po4029105 for ; Thu, 3 Apr 2008 21:04:25 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m33L4PoJ029103 for perforce@freebsd.org; Thu, 3 Apr 2008 21:04:25 GMT (envelope-from sam@freebsd.org) Date: Thu, 3 Apr 2008 21:04:25 GMT Message-Id: <200804032104.m33L4PoJ029103@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 139292 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Apr 2008 21:04:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=139292 Change 139292 by sam@sam_ebb on 2008/04/03 21:03:33 Use the com lock to cover scan state changes instead of doing some hoaky stuff that was race prone: o hold the com lock across the scan timer using callout_init_mtx o expand scope of various com locking to cover most all scan work (still have to deal with adding scan entries from the rx thread which is mostly ok as the scan policy module locks it's own internal data structures but we the mindwell handling is still safe only because rx processing is single-threaded and covered by IEEE80211_F_SCAN) Note these changes mean various callbacks into drivers are now done with the com lock held. It also means that drivers that call into the scan code because the device does scanning in firmware may nee locking changes to avoid LOR's. Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_scan.c#19 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_scan.c#19 (text+ko) ==== @@ -102,7 +102,7 @@ ic->ic_scan = NULL; return; } - callout_init(&ss->ss_scan_timer, CALLOUT_MPSAFE); + callout_init_mtx(&ss->ss_scan_timer, &ic->ic_comlock, 0); ic->ic_scan = &ss->base; ic->ic_scan_curchan = scan_curchan; @@ -446,25 +446,17 @@ /* * Start a scan unless one is already going. */ -int -ieee80211_start_scan(struct ieee80211vap *vap, int flags, - u_int duration, u_int mindwell, u_int maxdwell, +static int +start_scan_locked(const struct ieee80211_scanner *scan, + struct ieee80211vap *vap, int flags, u_int duration, + u_int mindwell, u_int maxdwell, u_int nssid, const struct ieee80211_scan_ssid ssids[]) { struct ieee80211com *ic = vap->iv_ic; - const struct ieee80211_scanner *scan; struct ieee80211_scan_state *ss = ic->ic_scan; - scan = ieee80211_scanner_get(vap->iv_opmode); - if (scan == NULL) { - IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN, - "%s: no scanner support for %s mode\n", - __func__, ieee80211_opmode_name[vap->iv_opmode]); - /* XXX stat */ - return 0; - } + IEEE80211_LOCK_ASSERT(ic); - IEEE80211_LOCK(ic); if (ic->ic_flags & IEEE80211_F_CSAPENDING) { IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN, "%s: scan inhibited by pending channel change\n", __func__); @@ -515,10 +507,36 @@ "%s: %s scan already in progress\n", __func__, ss->ss_flags & IEEE80211_SCAN_ACTIVE ? "active" : "passive"); } + return (ic->ic_flags & IEEE80211_F_SCAN); +} + +/* + * Start a scan unless one is already going. + */ +int +ieee80211_start_scan(struct ieee80211vap *vap, int flags, + u_int duration, u_int mindwell, u_int maxdwell, + u_int nssid, const struct ieee80211_scan_ssid ssids[]) +{ + struct ieee80211com *ic = vap->iv_ic; + const struct ieee80211_scanner *scan; + int result; + + scan = ieee80211_scanner_get(vap->iv_opmode); + if (scan == NULL) { + IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN, + "%s: no scanner support for %s mode\n", + __func__, ieee80211_opmode_name[vap->iv_opmode]); + /* XXX stat */ + return 0; + } + + IEEE80211_LOCK(ic); + result = start_scan_locked(scan, vap, flags, duration, + mindwell, maxdwell, nssid, ssids); IEEE80211_UNLOCK(ic); - /* NB: racey, does it matter? */ - return (ic->ic_flags & IEEE80211_F_SCAN); + return result; } /* @@ -533,7 +551,7 @@ struct ieee80211com *ic = vap->iv_ic; struct ieee80211_scan_state *ss = ic->ic_scan; const struct ieee80211_scanner *scan; - int checkscanlist = 0; + int checkscanlist = 0, result; scan = ieee80211_scanner_get(vap->iv_opmode); if (scan == NULL) { @@ -594,19 +612,22 @@ checkscanlist = 1; } } - IEEE80211_UNLOCK(ic); if (checkscanlist) { if (ss->ss_ops->scan_end(ss, vap)) { /* found an ap, just clear the flag */ ic->ic_flags &= ~IEEE80211_F_SCAN; ieee80211_notify_scan_done(vap); + IEEE80211_UNLOCK(ic); return 1; } /* no ap, clear the flag before starting a scan */ ic->ic_flags &= ~IEEE80211_F_SCAN; } - return ieee80211_start_scan(vap, flags, - duration, mindwell, maxdwell, nssid, ssids); + result = start_scan_locked(scan, vap, flags, duration, + mindwell, maxdwell, nssid, ssids); + IEEE80211_UNLOCK(ic); + + return result; } /* @@ -784,13 +805,17 @@ void ieee80211_scan_next(struct ieee80211vap *vap) { + struct ieee80211com *ic = vap->iv_ic; + /* * XXX: We might need/want to decouple context here by either: * callout_reset(&SCAN_PRIVATE(ss)->ss_scan_timer, 0, scan_next, ss); * or using a taskqueue. Let's see what kind of problems direct * dispatch has for now. */ - scan_next(vap->iv_ic->ic_scan); + IEEE80211_LOCK(ic); + scan_next(ic->ic_scan); + IEEE80211_UNLOCK(ic); } /* @@ -800,10 +825,14 @@ void ieee80211_scan_done(struct ieee80211vap *vap) { - struct ieee80211_scan_state *ss = vap->iv_ic->ic_scan; + struct ieee80211com *ic = vap->iv_ic; + struct ieee80211_scan_state *ss; + IEEE80211_LOCK(ic); + ss = ic->ic_scan; ss->ss_next = ss->ss_last; /* all channels are complete */ scan_next(ss); + IEEE80211_UNLOCK(ic); } /* @@ -880,14 +909,12 @@ struct ieee80211com *ic = vap->iv_ic; struct ieee80211_channel *chan; unsigned long maxdwell, scanend; - int scanning, scandone; + int scandone; + + IEEE80211_LOCK_ASSERT(ic); - IEEE80211_LOCK(ic); - scanning = (ic->ic_flags & IEEE80211_F_SCAN) != 0; - IEEE80211_UNLOCK(ic); - if (!scanning) /* canceled */ + if ((ic->ic_flags & IEEE80211_F_SCAN) == 0) return; - again: scandone = (ss->ss_next >= ss->ss_last) || (SCAN_PRIVATE(ss)->ss_iflags & ISCAN_CANCEL) != 0; @@ -1079,13 +1106,13 @@ struct ieee80211com *ic = vap->iv_ic; struct ieee80211_scan_state *ss = ic->ic_scan; + /* XXX locking */ /* * Frames received during startup are discarded to avoid * using scan state setup on the initial entry to the timer * callback. This can occur because the device may enable * rx prior to our doing the initial channel change in the - * timer routine (we defer the channel change to the timer - * code to simplify locking on linux). + * timer routine. */ if (SCAN_PRIVATE(ss)->ss_iflags & ISCAN_DISCARD) return; From owner-p4-projects@FreeBSD.ORG Thu Apr 3 21:08:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA9A41065671; Thu, 3 Apr 2008 21:08:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7D366106566B for ; Thu, 3 Apr 2008 21:08:30 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 67EC48FC0A for ; Thu, 3 Apr 2008 21:08:30 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m33L8UPf029565 for ; Thu, 3 Apr 2008 21:08:30 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m33L8UmZ029563 for perforce@freebsd.org; Thu, 3 Apr 2008 21:08:30 GMT (envelope-from thompsa@freebsd.org) Date: Thu, 3 Apr 2008 21:08:30 GMT Message-Id: <200804032108.m33L8UmZ029563@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 139293 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Apr 2008 21:08:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=139293 Change 139293 by thompsa@thompsa_burger on 2008/04/03 21:07:30 Always use the internal media routines so nuke the arguments to ieee80211_media_init. Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211.c#36 edit .. //depot/projects/vap/sys/net80211/ieee80211_regdomain.c#12 edit .. //depot/projects/vap/sys/net80211/ieee80211_var.h#38 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211.c#36 (text+ko) ==== @@ -205,8 +205,7 @@ * available channels as active, and pick a default * channel if not already specified. */ - ieee80211_media_init(ic, - ieee80211com_media_change, ieee80211com_media_status); + ieee80211_media_init(ic); ic->ic_update_mcast = null_update_mcast; ic->ic_update_promisc = null_update_promisc; @@ -933,8 +932,7 @@ } void -ieee80211_media_init(struct ieee80211com *ic, - ifm_change_cb_t media_change, ifm_stat_cb_t media_stat) +ieee80211_media_init(struct ieee80211com *ic) { struct ifnet *ifp = ic->ic_ifp; int maxrate; @@ -955,7 +953,7 @@ * the set of available modes. */ maxrate = ieee80211_media_setup(ic, &ic->ic_media, ic->ic_caps, 1, - media_change, media_stat); + ieee80211com_media_change, ieee80211com_media_status); /* NB: strip explicit mode; we're actually in autoselect */ ifmedia_set(&ic->ic_media, media_status(ic->ic_opmode, ic->ic_curchan) &~ IFM_MMASK); ==== //depot/projects/vap/sys/net80211/ieee80211_regdomain.c#12 (text+ko) ==== @@ -391,8 +391,7 @@ memset(&ic->ic_channels[ic->ic_nchans], 0, (IEEE80211_CHAN_MAX - ic->ic_nchans) * sizeof(struct ieee80211_channel)); - ieee80211_media_init(ic, ic->ic_media.ifm_change, - ic->ic_media.ifm_status); + ieee80211_media_init(ic); /* * Invalidate channel-related state. ==== //depot/projects/vap/sys/net80211/ieee80211_var.h#38 (text+ko) ==== @@ -540,8 +540,7 @@ void ieee80211_announce(struct ieee80211com *); void ieee80211_announce_channels(struct ieee80211com *); void ieee80211_drain(struct ieee80211com *); -void ieee80211_media_init(struct ieee80211com *, - ifm_change_cb_t, ifm_stat_cb_t); +void ieee80211_media_init(struct ieee80211com *); struct ieee80211com *ieee80211_find_vap(const uint8_t mac[IEEE80211_ADDR_LEN]); int ieee80211_media_change(struct ifnet *); void ieee80211_media_status(struct ifnet *, struct ifmediareq *); From owner-p4-projects@FreeBSD.ORG Thu Apr 3 21:11:34 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 69CC31065673; Thu, 3 Apr 2008 21:11:34 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2BE771065670 for ; Thu, 3 Apr 2008 21:11:34 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1677A8FC14 for ; Thu, 3 Apr 2008 21:11:34 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m33LBX1S029759 for ; Thu, 3 Apr 2008 21:11:33 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m33LBX7N029757 for perforce@freebsd.org; Thu, 3 Apr 2008 21:11:33 GMT (envelope-from thompsa@freebsd.org) Date: Thu, 3 Apr 2008 21:11:33 GMT Message-Id: <200804032111.m33LBX7N029757@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 139294 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Apr 2008 21:11:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=139294 Change 139294 by thompsa@thompsa_burger on 2008/04/03 21:11:27 We may panic if stopping the callout in wpi_newstate as the mutex _must_ be held. Go back to bailing from the callout if we arent in RUN anymore but hack it for vap. Kinda icky. Affected files ... .. //depot/projects/vap/sys/dev/wpi/if_wpi.c#14 edit Differences ... ==== //depot/projects/vap/sys/dev/wpi/if_wpi.c#14 (text+ko) ==== @@ -1263,8 +1263,6 @@ ieee80211_state_name[vap->iv_state], ieee80211_state_name[nstate], sc->flags)); - callout_stop(&sc->calib_to); - if (nstate == IEEE80211_S_AUTH) { /* Delay the auth transition until we can update the firmware */ error = wpi_queue_cmd(sc, WPI_AUTH, arg, WPI_QUEUE_NORMAL); @@ -3161,8 +3159,13 @@ wpi_calib_timeout(void *arg) { struct wpi_softc *sc = arg; + struct ieee80211com *ic = &sc->sc_ic; + struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps); int temp; + if (vap->iv_state != IEEE80211_S_RUN) + return; + /* update sensor data */ temp = (int)WPI_READ(sc, WPI_TEMPERATURE); DPRINTFN(WPI_DEBUG_TEMP,("Temp in calibration is: %d\n", temp)); From owner-p4-projects@FreeBSD.ORG Thu Apr 3 21:18:43 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 498DF106566B; Thu, 3 Apr 2008 21:18:43 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 091121065675 for ; Thu, 3 Apr 2008 21:18:43 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E5D4B8FC0C for ; Thu, 3 Apr 2008 21:18:42 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m33LIgm8029988 for ; Thu, 3 Apr 2008 21:18:42 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m33LIfW2029986 for perforce@freebsd.org; Thu, 3 Apr 2008 21:18:41 GMT (envelope-from sam@freebsd.org) Date: Thu, 3 Apr 2008 21:18:41 GMT Message-Id: <200804032118.m33LIfW2029986@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 139295 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Apr 2008 21:18:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=139295 Change 139295 by sam@sam_ebb on 2008/04/03 21:18:22 IFC @ 139294 Affected files ... .. //depot/projects/vap/Makefile#6 integrate .. //depot/projects/vap/Makefile.inc1#8 integrate .. //depot/projects/vap/ObsoleteFiles.inc#8 integrate .. //depot/projects/vap/cddl/Makefile.inc#3 integrate .. //depot/projects/vap/cddl/compat/opensolaris/include/alloca.h#1 branch .. //depot/projects/vap/cddl/compat/opensolaris/include/devid.h#1 branch .. //depot/projects/vap/cddl/compat/opensolaris/include/fcntl.h#1 branch .. //depot/projects/vap/cddl/compat/opensolaris/include/fsshare.h#1 branch .. //depot/projects/vap/cddl/compat/opensolaris/include/libintl.h#1 branch .. //depot/projects/vap/cddl/compat/opensolaris/include/mnttab.h#1 branch .. //depot/projects/vap/cddl/compat/opensolaris/include/priv.h#1 branch .. //depot/projects/vap/cddl/compat/opensolaris/include/solaris.h#1 branch .. //depot/projects/vap/cddl/compat/opensolaris/include/stdio.h#1 branch .. //depot/projects/vap/cddl/compat/opensolaris/include/stdlib.h#1 branch .. //depot/projects/vap/cddl/compat/opensolaris/include/strings.h#1 branch .. //depot/projects/vap/cddl/compat/opensolaris/include/unistd.h#1 branch .. //depot/projects/vap/cddl/compat/opensolaris/include/zone.h#1 branch .. //depot/projects/vap/cddl/compat/opensolaris/lib/libumem/umem.c#1 branch .. //depot/projects/vap/cddl/compat/opensolaris/lib/libumem/umem.h#1 branch .. //depot/projects/vap/cddl/compat/opensolaris/misc/deviceid.c#1 branch .. //depot/projects/vap/cddl/compat/opensolaris/misc/fsshare.c#1 branch .. //depot/projects/vap/cddl/compat/opensolaris/misc/mkdirp.c#1 branch .. //depot/projects/vap/cddl/compat/opensolaris/misc/mnttab.c#1 branch .. //depot/projects/vap/cddl/compat/opensolaris/misc/zmount.c#1 branch .. //depot/projects/vap/cddl/compat/opensolaris/misc/zone.c#1 branch .. //depot/projects/vap/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/vap/cddl/contrib/opensolaris/cmd/zdb/zdb.8#1 branch .. //depot/projects/vap/cddl/contrib/opensolaris/cmd/zdb/zdb.c#1 branch .. //depot/projects/vap/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c#1 branch .. //depot/projects/vap/cddl/contrib/opensolaris/cmd/zfs/zfs.8#1 branch .. //depot/projects/vap/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c#1 branch .. //depot/projects/vap/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h#1 branch .. //depot/projects/vap/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c#1 branch .. //depot/projects/vap/cddl/contrib/opensolaris/cmd/zfs/zfs_util.h#1 branch .. //depot/projects/vap/cddl/contrib/opensolaris/cmd/zpool/zpool.8#1 branch .. //depot/projects/vap/cddl/contrib/opensolaris/cmd/zpool/zpool_iter.c#1 branch .. //depot/projects/vap/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c#1 branch .. //depot/projects/vap/cddl/contrib/opensolaris/cmd/zpool/zpool_util.c#1 branch .. //depot/projects/vap/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h#1 branch .. //depot/projects/vap/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c#1 branch .. //depot/projects/vap/cddl/contrib/opensolaris/cmd/ztest/ztest.c#1 branch .. //depot/projects/vap/cddl/contrib/opensolaris/head/assert.h#1 branch .. //depot/projects/vap/cddl/contrib/opensolaris/head/atomic.h#1 branch .. //depot/projects/vap/cddl/contrib/opensolaris/head/libintl.h#1 branch .. //depot/projects/vap/cddl/contrib/opensolaris/head/stdio_ext.h#1 branch .. //depot/projects/vap/cddl/contrib/opensolaris/head/synch.h#1 branch .. //depot/projects/vap/cddl/contrib/opensolaris/head/thread.h#1 branch .. //depot/projects/vap/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c#1 branch .. //depot/projects/vap/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.h#1 branch .. //depot/projects/vap/cddl/contrib/opensolaris/lib/libnvpair/nvpair_alloc_system.c#1 branch .. //depot/projects/vap/cddl/contrib/opensolaris/lib/libuutil/common/libuutil.h#1 branch .. //depot/projects/vap/cddl/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#1 branch .. //depot/projects/vap/cddl/contrib/opensolaris/lib/libuutil/common/libuutil_impl.h#1 branch .. //depot/projects/vap/cddl/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#1 branch .. //depot/projects/vap/cddl/contrib/opensolaris/lib/libuutil/common/uu_avl.c#1 branch .. //depot/projects/vap/cddl/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c#1 branch .. //depot/projects/vap/cddl/contrib/opensolaris/lib/libuutil/common/uu_ident.c#1 branch .. //depot/projects/vap/cddl/contrib/opensolaris/lib/libuutil/common/uu_list.c#1 branch .. //depot/projects/vap/cddl/contrib/opensolaris/lib/libuutil/common/uu_misc.c#1 branch .. //depot/projects/vap/cddl/contrib/opensolaris/lib/libuutil/common/uu_open.c#1 branch .. //depot/projects/vap/cddl/contrib/opensolaris/lib/libuutil/common/uu_pname.c#1 branch .. //depot/projects/vap/cddl/contrib/opensolaris/lib/libuutil/common/uu_strtoint.c#1 branch .. //depot/projects/vap/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h#1 branch .. //depot/projects/vap/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#1 branch .. //depot/projects/vap/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#1 branch .. //depot/projects/vap/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#1 branch .. //depot/projects/vap/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#1 branch .. //depot/projects/vap/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#1 branch .. //depot/projects/vap/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#1 branch .. //depot/projects/vap/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#1 branch .. //depot/projects/vap/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#1 branch .. //depot/projects/vap/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#1 branch .. //depot/projects/vap/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#1 branch .. //depot/projects/vap/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c#1 branch .. //depot/projects/vap/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#1 branch .. //depot/projects/vap/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c#1 branch .. //depot/projects/vap/cddl/contrib/opensolaris/lib/libzpool/common/util.c#1 branch .. //depot/projects/vap/cddl/lib/Makefile#3 integrate .. //depot/projects/vap/cddl/lib/libavl/Makefile#3 integrate .. //depot/projects/vap/cddl/lib/libnvpair/Makefile#3 integrate .. //depot/projects/vap/cddl/lib/libumem/Makefile#3 integrate .. //depot/projects/vap/cddl/lib/libuutil/Makefile#3 integrate .. //depot/projects/vap/cddl/lib/libzfs/Makefile#3 integrate .. //depot/projects/vap/cddl/lib/libzpool/Makefile#3 integrate .. //depot/projects/vap/cddl/sbin/zfs/Makefile#3 integrate .. //depot/projects/vap/cddl/sbin/zpool/Makefile#3 integrate .. //depot/projects/vap/cddl/usr.bin/Makefile#3 integrate .. //depot/projects/vap/cddl/usr.bin/ztest/Makefile#3 integrate .. //depot/projects/vap/cddl/usr.sbin/Makefile#3 integrate .. //depot/projects/vap/cddl/usr.sbin/zdb/Makefile#3 integrate .. //depot/projects/vap/compat/opensolaris/include/alloca.h#3 delete .. //depot/projects/vap/compat/opensolaris/include/devid.h#3 delete .. //depot/projects/vap/compat/opensolaris/include/fcntl.h#3 delete .. //depot/projects/vap/compat/opensolaris/include/fsshare.h#3 delete .. //depot/projects/vap/compat/opensolaris/include/libintl.h#3 delete .. //depot/projects/vap/compat/opensolaris/include/mnttab.h#3 delete .. //depot/projects/vap/compat/opensolaris/include/priv.h#3 delete .. //depot/projects/vap/compat/opensolaris/include/solaris.h#3 delete .. //depot/projects/vap/compat/opensolaris/include/stdio.h#3 delete .. //depot/projects/vap/compat/opensolaris/include/stdlib.h#3 delete .. //depot/projects/vap/compat/opensolaris/include/strings.h#3 delete .. //depot/projects/vap/compat/opensolaris/include/unistd.h#3 delete .. //depot/projects/vap/compat/opensolaris/include/zone.h#3 delete .. //depot/projects/vap/compat/opensolaris/lib/libumem/umem.c#3 delete .. //depot/projects/vap/compat/opensolaris/lib/libumem/umem.h#3 delete .. //depot/projects/vap/compat/opensolaris/misc/deviceid.c#3 delete .. //depot/projects/vap/compat/opensolaris/misc/fsshare.c#3 delete .. //depot/projects/vap/compat/opensolaris/misc/mkdirp.c#3 delete .. //depot/projects/vap/compat/opensolaris/misc/mnttab.c#3 delete .. //depot/projects/vap/compat/opensolaris/misc/zmount.c#3 delete .. //depot/projects/vap/compat/opensolaris/misc/zone.c#3 delete .. //depot/projects/vap/contrib/netcat/nc.1#3 integrate .. //depot/projects/vap/contrib/netcat/netcat.c#3 integrate .. //depot/projects/vap/contrib/opensolaris/OPENSOLARIS.LICENSE#3 delete .. //depot/projects/vap/contrib/opensolaris/cmd/zdb/zdb.8#3 delete .. //depot/projects/vap/contrib/opensolaris/cmd/zdb/zdb.c#3 delete .. //depot/projects/vap/contrib/opensolaris/cmd/zdb/zdb_il.c#3 delete .. //depot/projects/vap/contrib/opensolaris/cmd/zfs/zfs.8#3 delete .. //depot/projects/vap/contrib/opensolaris/cmd/zfs/zfs_iter.c#3 delete .. //depot/projects/vap/contrib/opensolaris/cmd/zfs/zfs_iter.h#3 delete .. //depot/projects/vap/contrib/opensolaris/cmd/zfs/zfs_main.c#3 delete .. //depot/projects/vap/contrib/opensolaris/cmd/zfs/zfs_util.h#3 delete .. //depot/projects/vap/contrib/opensolaris/cmd/zpool/zpool.8#3 delete .. //depot/projects/vap/contrib/opensolaris/cmd/zpool/zpool_iter.c#3 delete .. //depot/projects/vap/contrib/opensolaris/cmd/zpool/zpool_main.c#3 delete .. //depot/projects/vap/contrib/opensolaris/cmd/zpool/zpool_util.c#3 delete .. //depot/projects/vap/contrib/opensolaris/cmd/zpool/zpool_util.h#3 delete .. //depot/projects/vap/contrib/opensolaris/cmd/zpool/zpool_vdev.c#3 delete .. //depot/projects/vap/contrib/opensolaris/cmd/ztest/ztest.c#3 delete .. //depot/projects/vap/contrib/opensolaris/head/assert.h#3 delete .. //depot/projects/vap/contrib/opensolaris/head/atomic.h#3 delete .. //depot/projects/vap/contrib/opensolaris/head/libintl.h#3 delete .. //depot/projects/vap/contrib/opensolaris/head/stdio_ext.h#3 delete .. //depot/projects/vap/contrib/opensolaris/head/synch.h#3 delete .. //depot/projects/vap/contrib/opensolaris/head/thread.h#3 delete .. //depot/projects/vap/contrib/opensolaris/lib/libnvpair/libnvpair.c#3 delete .. //depot/projects/vap/contrib/opensolaris/lib/libnvpair/libnvpair.h#3 delete .. //depot/projects/vap/contrib/opensolaris/lib/libnvpair/nvpair_alloc_system.c#3 delete .. //depot/projects/vap/contrib/opensolaris/lib/libuutil/common/libuutil.h#3 delete .. //depot/projects/vap/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#3 delete .. //depot/projects/vap/contrib/opensolaris/lib/libuutil/common/libuutil_impl.h#3 delete .. //depot/projects/vap/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#3 delete .. //depot/projects/vap/contrib/opensolaris/lib/libuutil/common/uu_avl.c#3 delete .. //depot/projects/vap/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c#3 delete .. //depot/projects/vap/contrib/opensolaris/lib/libuutil/common/uu_ident.c#3 delete .. //depot/projects/vap/contrib/opensolaris/lib/libuutil/common/uu_list.c#3 delete .. //depot/projects/vap/contrib/opensolaris/lib/libuutil/common/uu_misc.c#3 delete .. //depot/projects/vap/contrib/opensolaris/lib/libuutil/common/uu_open.c#3 delete .. //depot/projects/vap/contrib/opensolaris/lib/libuutil/common/uu_pname.c#3 delete .. //depot/projects/vap/contrib/opensolaris/lib/libuutil/common/uu_strtoint.c#3 delete .. //depot/projects/vap/contrib/opensolaris/lib/libzfs/common/libzfs.h#3 delete .. //depot/projects/vap/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#3 delete .. //depot/projects/vap/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#3 delete .. //depot/projects/vap/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#3 delete .. //depot/projects/vap/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#3 delete .. //depot/projects/vap/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#3 delete .. //depot/projects/vap/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#3 delete .. //depot/projects/vap/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#3 delete .. //depot/projects/vap/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#3 delete .. //depot/projects/vap/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#3 delete .. //depot/projects/vap/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#3 delete .. //depot/projects/vap/contrib/opensolaris/lib/libzpool/common/kernel.c#3 delete .. //depot/projects/vap/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#3 delete .. //depot/projects/vap/contrib/opensolaris/lib/libzpool/common/taskq.c#3 delete .. //depot/projects/vap/contrib/opensolaris/lib/libzpool/common/util.c#3 delete .. //depot/projects/vap/contrib/pf/pfctl/pfctl_altq.c#3 integrate .. //depot/projects/vap/contrib/pf/pfctl/pfctl_qstats.c#3 integrate .. //depot/projects/vap/etc/network.subr#7 integrate .. //depot/projects/vap/etc/newsyslog.conf#3 integrate .. //depot/projects/vap/etc/rc.d/ppp#4 integrate .. //depot/projects/vap/etc/rc.d/zfs#4 integrate .. //depot/projects/vap/games/fortune/datfiles/fortunes#6 integrate .. //depot/projects/vap/gnu/usr.bin/gdb/kgdb/kld.c#3 integrate .. //depot/projects/vap/gnu/usr.bin/gdb/kgdb/main.c#5 integrate .. //depot/projects/vap/include/complex.h#4 integrate .. //depot/projects/vap/include/stdio.h#3 integrate .. //depot/projects/vap/include/unistd.h#7 integrate .. //depot/projects/vap/lib/libarchive/archive_entry_private.h#4 integrate .. //depot/projects/vap/lib/libc/gen/Makefile.inc#6 integrate .. //depot/projects/vap/lib/libc/gen/lockf.c#3 integrate .. //depot/projects/vap/lib/libc/gen/modf.3#3 integrate .. //depot/projects/vap/lib/libc/gen/msgctl.3#3 integrate .. //depot/projects/vap/lib/libc/gen/sysctl.3#3 integrate .. //depot/projects/vap/lib/libc/include/namespace.h#5 integrate .. //depot/projects/vap/lib/libc/include/un-namespace.h#5 integrate .. //depot/projects/vap/lib/libc/rpc/svc_vc.c#3 integrate .. //depot/projects/vap/lib/libc/stdtime/localtime.c#4 integrate .. //depot/projects/vap/lib/libc/sys/Makefile.inc#5 integrate .. //depot/projects/vap/lib/libc/sys/Symbol.map#5 integrate .. //depot/projects/vap/lib/libc/sys/aio_cancel.2#3 integrate .. //depot/projects/vap/lib/libc/sys/aio_suspend.2#3 integrate .. //depot/projects/vap/lib/libc/sys/cpuset.2#1 branch .. //depot/projects/vap/lib/libc/sys/cpuset_getaffinity.2#1 branch .. //depot/projects/vap/lib/libc/sys/fcntl.2#4 integrate .. //depot/projects/vap/lib/libc/sys/mincore.2#3 integrate .. //depot/projects/vap/lib/libc/xdr/xdr_rec.c#3 integrate .. //depot/projects/vap/lib/libc/yp/xdryp.c#3 integrate .. //depot/projects/vap/lib/libc_r/uthread/uthread_sig.c#3 integrate .. //depot/projects/vap/lib/libelf/libelf_convert.m4#3 integrate .. //depot/projects/vap/lib/libkse/thread/thr_sig.c#3 integrate .. //depot/projects/vap/lib/libthr/Makefile#6 integrate .. //depot/projects/vap/lib/libthr/arch/amd64/Makefile.inc#4 integrate .. //depot/projects/vap/lib/libthr/arch/amd64/amd64/_umtx_op_err.S#1 branch .. //depot/projects/vap/lib/libthr/arch/amd64/include/pthread_md.h#3 integrate .. //depot/projects/vap/lib/libthr/arch/i386/Makefile.inc#4 integrate .. //depot/projects/vap/lib/libthr/arch/i386/i386/_umtx_op_err.S#1 branch .. //depot/projects/vap/lib/libthr/arch/i386/include/pthread_md.h#3 integrate .. //depot/projects/vap/lib/libthr/thread/thr_affinity.c#3 integrate .. //depot/projects/vap/lib/libthr/thread/thr_cond.c#3 integrate .. //depot/projects/vap/lib/libthr/thread/thr_private.h#5 integrate .. //depot/projects/vap/lib/libthr/thread/thr_rtld.c#4 integrate .. //depot/projects/vap/lib/libthr/thread/thr_rwlock.c#3 integrate .. //depot/projects/vap/lib/libthr/thread/thr_umtx.c#3 integrate .. //depot/projects/vap/lib/libthr/thread/thr_umtx.h#3 integrate .. //depot/projects/vap/lib/msun/Makefile#7 integrate .. //depot/projects/vap/lib/msun/Symbol.map#7 integrate .. //depot/projects/vap/lib/msun/amd64/Makefile.inc#6 integrate .. //depot/projects/vap/lib/msun/amd64/e_remainderl.S#1 branch .. //depot/projects/vap/lib/msun/amd64/s_remquol.S#1 branch .. //depot/projects/vap/lib/msun/i387/Makefile.inc#5 integrate .. //depot/projects/vap/lib/msun/i387/e_remainderl.S#1 branch .. //depot/projects/vap/lib/msun/i387/s_remquol.S#1 branch .. //depot/projects/vap/lib/msun/man/csqrt.3#2 integrate .. //depot/projects/vap/lib/msun/man/hypot.3#4 integrate .. //depot/projects/vap/lib/msun/man/remainder.3#3 integrate .. //depot/projects/vap/lib/msun/src/e_hypot.c#4 integrate .. //depot/projects/vap/lib/msun/src/e_hypotf.c#4 integrate .. //depot/projects/vap/lib/msun/src/e_hypotl.c#1 branch .. //depot/projects/vap/lib/msun/src/e_log.c#4 integrate .. //depot/projects/vap/lib/msun/src/e_logf.c#4 integrate .. //depot/projects/vap/lib/msun/src/e_remainder.c#4 integrate .. //depot/projects/vap/lib/msun/src/e_remainderl.c#1 branch .. //depot/projects/vap/lib/msun/src/math.h#7 integrate .. //depot/projects/vap/lib/msun/src/s_csqrt.c#2 integrate .. //depot/projects/vap/lib/msun/src/s_csqrtl.c#1 branch .. //depot/projects/vap/lib/msun/src/s_expm1.c#4 integrate .. //depot/projects/vap/lib/msun/src/s_expm1f.c#4 integrate .. //depot/projects/vap/lib/msun/src/s_fma.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_fmaf.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_fmal.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_log1p.c#4 integrate .. //depot/projects/vap/lib/msun/src/s_log1pf.c#4 integrate .. //depot/projects/vap/lib/msun/src/s_remquo.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_remquol.c#1 branch .. //depot/projects/vap/lib/msun/src/w_cabs.c#5 integrate .. //depot/projects/vap/lib/msun/src/w_cabsl.c#1 branch .. //depot/projects/vap/libexec/talkd/announce.c#3 integrate .. //depot/projects/vap/release/doc/en_US.ISO8859-1/relnotes/article.sgml#7 integrate .. //depot/projects/vap/rescue/rescue/Makefile#4 integrate .. //depot/projects/vap/sbin/dhclient/dhclient-script#4 integrate .. //depot/projects/vap/sbin/ggate/Makefile#3 integrate .. //depot/projects/vap/sbin/ifconfig/ifclone.c#6 integrate .. //depot/projects/vap/sbin/ifconfig/ifconfig.c#7 integrate .. //depot/projects/vap/sbin/ifconfig/ifconfig.h#6 integrate .. //depot/projects/vap/sbin/ifconfig/ifvlan.c#6 integrate .. //depot/projects/vap/share/man/man3/Makefile#4 integrate .. //depot/projects/vap/share/man/man4/Makefile#8 integrate .. //depot/projects/vap/share/man/man4/arcmsr.4#3 integrate .. //depot/projects/vap/share/man/man4/ng_pptpgre.4#3 integrate .. //depot/projects/vap/share/man/man4/ubsa.4#3 integrate .. //depot/projects/vap/share/man/man5/rc.conf.5#6 integrate .. //depot/projects/vap/share/man/man5/src.conf.5#5 integrate .. //depot/projects/vap/share/man/man7/security.7#3 integrate .. //depot/projects/vap/share/man/man8/rc.subr.8#3 integrate .. //depot/projects/vap/share/man/man9/Makefile#8 integrate .. //depot/projects/vap/share/man/man9/lock.9#8 integrate .. //depot/projects/vap/share/man/man9/rwlock.9#4 integrate .. //depot/projects/vap/share/mk/bsd.own.mk#5 integrate .. //depot/projects/vap/share/mk/sys.mk#4 integrate .. //depot/projects/vap/sys/amd64/amd64/pmap.c#10 integrate .. //depot/projects/vap/sys/amd64/amd64/prof_machdep.c#6 integrate .. //depot/projects/vap/sys/amd64/conf/GENERIC#10 integrate .. //depot/projects/vap/sys/amd64/conf/NOTES#9 integrate .. //depot/projects/vap/sys/amd64/include/clock.h#5 integrate .. //depot/projects/vap/sys/amd64/include/param.h#6 integrate .. //depot/projects/vap/sys/amd64/include/timerreg.h#3 integrate .. //depot/projects/vap/sys/amd64/isa/clock.c#7 integrate .. //depot/projects/vap/sys/arm/arm/bus_space_generic.c#1 branch .. //depot/projects/vap/sys/arm/arm/machdep.c#7 integrate .. //depot/projects/vap/sys/arm/at91/kb920x_machdep.c#4 integrate .. //depot/projects/vap/sys/arm/conf/AVILA#7 integrate .. //depot/projects/vap/sys/arm/conf/BWCT#4 integrate .. //depot/projects/vap/sys/arm/conf/CRB#4 integrate .. //depot/projects/vap/sys/arm/conf/EP80219#4 integrate .. //depot/projects/vap/sys/arm/conf/HL200#4 integrate .. //depot/projects/vap/sys/arm/conf/IQ31244#6 integrate .. //depot/projects/vap/sys/arm/conf/KB920X#4 integrate .. //depot/projects/vap/sys/arm/conf/SIMICS#6 integrate .. //depot/projects/vap/sys/arm/conf/SKYEYE#4 integrate .. //depot/projects/vap/sys/arm/include/machdep.h#4 integrate .. //depot/projects/vap/sys/arm/include/param.h#5 integrate .. //depot/projects/vap/sys/arm/sa11x0/assabet_machdep.c#5 integrate .. //depot/projects/vap/sys/arm/sa11x0/files.sa11x0#4 integrate .. //depot/projects/vap/sys/arm/sa11x0/sa11x0_io.c#6 integrate .. //depot/projects/vap/sys/arm/xscale/i80321/ep80219_machdep.c#3 integrate .. //depot/projects/vap/sys/arm/xscale/i80321/files.ep80219#3 integrate .. //depot/projects/vap/sys/arm/xscale/i80321/files.i80219#3 integrate .. //depot/projects/vap/sys/arm/xscale/i80321/files.i80321#5 integrate .. //depot/projects/vap/sys/arm/xscale/i80321/files.iq31244#3 integrate .. //depot/projects/vap/sys/arm/xscale/i80321/iq31244_machdep.c#6 integrate .. //depot/projects/vap/sys/arm/xscale/i80321/obio_space.c#6 integrate .. //depot/projects/vap/sys/arm/xscale/i8134x/crb_machdep.c#4 integrate .. //depot/projects/vap/sys/arm/xscale/i8134x/obio_space.c#3 integrate .. //depot/projects/vap/sys/arm/xscale/ixp425/avila_machdep.c#3 integrate .. //depot/projects/vap/sys/arm/xscale/ixp425/files.avila#3 integrate .. //depot/projects/vap/sys/arm/xscale/ixp425/files.ixp425#3 integrate .. //depot/projects/vap/sys/arm/xscale/ixp425/ixp425_a4x_space.c#3 integrate .. //depot/projects/vap/sys/arm/xscale/ixp425/ixp425_space.c#3 integrate .. //depot/projects/vap/sys/boot/forth/loader.conf#6 integrate .. //depot/projects/vap/sys/boot/i386/cdboot/cdboot.s#5 integrate .. //depot/projects/vap/sys/boot/pc98/cdboot/cdboot.s#3 integrate .. //depot/projects/vap/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/kern/opensolaris_kstat.c#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/kern/opensolaris_string.c#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/kern/opensolaris_zone.c#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/machine/endian.h#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/rpc/xdr.h#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/acl.h#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/atomic.h#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/bitmap.h#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/byteorder.h#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/callb.h#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/cmn_err.h#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/cpupart.h#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/cpuvar.h#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/cred.h#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/cyclic.h#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/debug.h#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/dirent.h#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/dkio.h#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/dnlc.h#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/elf.h#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/kcondvar.h#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/kmem.h#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/kobj.h#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/kstat.h#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/lock.h#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/misc.h#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/mman.h#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/mntent.h#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/mnttab.h#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/modctl.h#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/mount.h#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/mutex.h#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/objfs.h#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/param.h#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/pcpu.h#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/policy.h#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/proc.h#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/random.h#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/rwlock.h#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/sdt.h#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/stat.h#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/string.h#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/sunddi.h#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/sysmacros.h#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/systm.h#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/taskq.h#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/taskq_impl.h#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/time.h#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/types.h#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/uio.h#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/varargs.h#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/vfs.h#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/vnode.h#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/zone.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/common/atomic/i386/atomic.S#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/common/atomic/ia64/atomic.S#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/common/avl/avl.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/Makefile.files#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bplist.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/gzip.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sha256.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/unique.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/os/callb.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/os/list.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/os/taskq.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_array.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_mem.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/asm_linkage.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/avl_impl.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/bitmap.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/byteorder.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/callb.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/ccompile.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/compress.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/cred.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/dkio.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/dklabel.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/errorq.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/feature_tests.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/fm/protocol.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/fm/util.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/gfs.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/list.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/list_impl.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/note.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair_impl.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/processor.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/procset.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/sdt.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/synch.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/vmem.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/zmod.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/zmod/adler32.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/zmod/deflate.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/zmod/deflate.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/zmod/inffast.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/zmod/inffast.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/zmod/inffixed.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/zmod/inflate.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/zmod/inflate.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/zmod/inftrees.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/zmod/inftrees.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/zmod/trees.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/zmod/zconf.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/zmod/zlib.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod_subr.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/zmod/zutil.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/zmod/zutil.h#1 branch .. //depot/projects/vap/sys/compat/freebsd32/freebsd32_misc.c#7 integrate .. //depot/projects/vap/sys/compat/freebsd32/freebsd32_proto.h#11 integrate .. //depot/projects/vap/sys/compat/freebsd32/freebsd32_syscall.h#11 integrate .. //depot/projects/vap/sys/compat/freebsd32/freebsd32_syscalls.c#11 integrate .. //depot/projects/vap/sys/compat/freebsd32/freebsd32_sysent.c#11 integrate .. //depot/projects/vap/sys/compat/freebsd32/syscalls.master#11 integrate .. //depot/projects/vap/sys/compat/linprocfs/linprocfs.c#7 integrate .. //depot/projects/vap/sys/compat/linux/linux_file.c#7 integrate .. //depot/projects/vap/sys/compat/linux/linux_uid16.c#5 integrate .. //depot/projects/vap/sys/compat/linux/linux_util.c#6 integrate .. //depot/projects/vap/sys/compat/opensolaris/kern/opensolaris_atomic.c#3 delete .. //depot/projects/vap/sys/compat/opensolaris/kern/opensolaris_kmem.c#4 delete .. //depot/projects/vap/sys/compat/opensolaris/kern/opensolaris_kobj.c#4 delete .. //depot/projects/vap/sys/compat/opensolaris/kern/opensolaris_kstat.c#3 delete .. //depot/projects/vap/sys/compat/opensolaris/kern/opensolaris_misc.c#3 delete .. //depot/projects/vap/sys/compat/opensolaris/kern/opensolaris_policy.c#3 delete .. //depot/projects/vap/sys/compat/opensolaris/kern/opensolaris_string.c#3 delete .. //depot/projects/vap/sys/compat/opensolaris/kern/opensolaris_vfs.c#4 delete .. //depot/projects/vap/sys/compat/opensolaris/kern/opensolaris_zone.c#3 delete .. //depot/projects/vap/sys/compat/opensolaris/machine/endian.h#3 delete .. //depot/projects/vap/sys/compat/opensolaris/rpc/xdr.h#3 delete .. //depot/projects/vap/sys/compat/opensolaris/sys/acl.h#3 delete .. //depot/projects/vap/sys/compat/opensolaris/sys/atomic.h#3 delete .. //depot/projects/vap/sys/compat/opensolaris/sys/bitmap.h#3 delete .. //depot/projects/vap/sys/compat/opensolaris/sys/byteorder.h#3 delete .. //depot/projects/vap/sys/compat/opensolaris/sys/callb.h#3 delete .. //depot/projects/vap/sys/compat/opensolaris/sys/cmn_err.h#3 delete .. //depot/projects/vap/sys/compat/opensolaris/sys/cpupart.h#3 delete .. //depot/projects/vap/sys/compat/opensolaris/sys/cpuvar.h#3 delete .. //depot/projects/vap/sys/compat/opensolaris/sys/cred.h#3 delete .. //depot/projects/vap/sys/compat/opensolaris/sys/cyclic.h#3 delete .. //depot/projects/vap/sys/compat/opensolaris/sys/debug.h#3 delete .. //depot/projects/vap/sys/compat/opensolaris/sys/dirent.h#3 delete .. //depot/projects/vap/sys/compat/opensolaris/sys/dkio.h#3 delete .. //depot/projects/vap/sys/compat/opensolaris/sys/dnlc.h#3 delete .. //depot/projects/vap/sys/compat/opensolaris/sys/elf.h#3 delete .. //depot/projects/vap/sys/compat/opensolaris/sys/kcondvar.h#3 delete .. //depot/projects/vap/sys/compat/opensolaris/sys/kmem.h#4 delete .. //depot/projects/vap/sys/compat/opensolaris/sys/kobj.h#3 delete .. //depot/projects/vap/sys/compat/opensolaris/sys/kstat.h#3 delete .. //depot/projects/vap/sys/compat/opensolaris/sys/lock.h#3 delete .. //depot/projects/vap/sys/compat/opensolaris/sys/misc.h#3 delete .. //depot/projects/vap/sys/compat/opensolaris/sys/mman.h#3 delete .. //depot/projects/vap/sys/compat/opensolaris/sys/mntent.h#3 delete .. //depot/projects/vap/sys/compat/opensolaris/sys/mnttab.h#3 delete .. //depot/projects/vap/sys/compat/opensolaris/sys/modctl.h#3 delete .. //depot/projects/vap/sys/compat/opensolaris/sys/mount.h#3 delete .. //depot/projects/vap/sys/compat/opensolaris/sys/mutex.h#3 delete .. //depot/projects/vap/sys/compat/opensolaris/sys/objfs.h#3 delete .. //depot/projects/vap/sys/compat/opensolaris/sys/param.h#3 delete .. //depot/projects/vap/sys/compat/opensolaris/sys/pcpu.h#3 delete .. //depot/projects/vap/sys/compat/opensolaris/sys/policy.h#3 delete .. //depot/projects/vap/sys/compat/opensolaris/sys/proc.h#3 delete .. //depot/projects/vap/sys/compat/opensolaris/sys/random.h#3 delete .. //depot/projects/vap/sys/compat/opensolaris/sys/rwlock.h#3 delete .. //depot/projects/vap/sys/compat/opensolaris/sys/sdt.h#3 delete .. //depot/projects/vap/sys/compat/opensolaris/sys/stat.h#3 delete .. //depot/projects/vap/sys/compat/opensolaris/sys/string.h#3 delete .. //depot/projects/vap/sys/compat/opensolaris/sys/sunddi.h#3 delete .. //depot/projects/vap/sys/compat/opensolaris/sys/sysmacros.h#3 delete .. //depot/projects/vap/sys/compat/opensolaris/sys/systm.h#3 delete .. //depot/projects/vap/sys/compat/opensolaris/sys/taskq.h#3 delete .. //depot/projects/vap/sys/compat/opensolaris/sys/taskq_impl.h#3 delete .. //depot/projects/vap/sys/compat/opensolaris/sys/time.h#3 delete .. //depot/projects/vap/sys/compat/opensolaris/sys/types.h#3 delete .. //depot/projects/vap/sys/compat/opensolaris/sys/uio.h#3 delete .. //depot/projects/vap/sys/compat/opensolaris/sys/varargs.h#3 delete .. //depot/projects/vap/sys/compat/opensolaris/sys/vfs.h#3 delete .. //depot/projects/vap/sys/compat/opensolaris/sys/vnode.h#4 delete .. //depot/projects/vap/sys/compat/opensolaris/sys/zone.h#3 delete .. //depot/projects/vap/sys/compat/pecoff/imgact_pecoff.c#7 integrate .. //depot/projects/vap/sys/compat/svr4/svr4_fcntl.c#8 integrate .. //depot/projects/vap/sys/compat/svr4/svr4_sysvec.c#7 integrate .. //depot/projects/vap/sys/conf/Makefile.arm#7 integrate .. //depot/projects/vap/sys/conf/NOTES#12 integrate .. //depot/projects/vap/sys/conf/files#28 integrate .. //depot/projects/vap/sys/conf/options#17 integrate .. //depot/projects/vap/sys/conf/options.amd64#6 integrate .. //depot/projects/vap/sys/conf/options.i386#6 integrate .. //depot/projects/vap/sys/conf/options.pc98#6 integrate .. //depot/projects/vap/sys/contrib/opensolaris/OPENSOLARIS.LICENSE#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/common/acl/acl_common.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/common/acl/acl_common.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/common/atomic/i386/atomic.S#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/common/atomic/ia64/atomic.S#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/common/avl/avl.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/common/nvpair/nvpair.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/common/zfs/zfs_namecheck.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/common/zfs/zfs_namecheck.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/common/zfs/zfs_prop.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/common/zfs/zfs_prop.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/Makefile.files#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/gfs.c#4 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#4 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/bplist.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/dmu.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/dnode.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/gzip.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/refcount.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/sha256.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/space_map.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/txg.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/unique.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#4 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#4 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#4 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#6 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#5 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/os/callb.c#4 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/os/list.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/os/taskq.c#4 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/rpc/xdr.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/rpc/xdr.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/rpc/xdr_array.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/rpc/xdr_mem.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/sys/asm_linkage.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/sys/avl.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/sys/avl_impl.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/sys/bitmap.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/sys/byteorder.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/sys/callb.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/sys/ccompile.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/sys/compress.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/sys/cred.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/sys/debug.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/sys/dkio.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/sys/dklabel.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/sys/errorq.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/sys/feature_tests.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/sys/fm/protocol.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/sys/fm/util.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/sys/fs/zfs.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/sys/gfs.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/sys/list.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/sys/list_impl.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/sys/note.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/sys/nvpair.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/sys/nvpair_impl.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/sys/processor.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/sys/procset.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/sys/sdt.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/sys/synch.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/sys/sysevent.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/sys/vmem.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/sys/zmod.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/zmod/adler32.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/zmod/crc32.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/zmod/crc32.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/zmod/deflate.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/zmod/deflate.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/zmod/inffast.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/zmod/inffast.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/zmod/inffixed.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/zmod/inflate.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/zmod/inflate.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/zmod/inftrees.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/zmod/inftrees.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/zmod/trees.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/zmod/zconf.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/zmod/zlib.h#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/zmod/zmod.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/zmod/zmod_subr.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/zmod/zutil.c#3 delete .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/zmod/zutil.h#3 delete .. //depot/projects/vap/sys/contrib/pf/net/pf_if.c#6 integrate .. //depot/projects/vap/sys/contrib/pf/net/pf_ioctl.c#6 integrate .. //depot/projects/vap/sys/contrib/pf/net/pfvar.h#5 integrate .. //depot/projects/vap/sys/dev/aac/aac.c#11 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_adapter.h#6 integrate .. //depot/projects/vap/sys/dev/cxgb/sys/cxgb_support.c#4 integrate .. //depot/projects/vap/sys/dev/em/e1000_80003es2lan.c#4 integrate .. //depot/projects/vap/sys/dev/em/e1000_82540.c#4 integrate .. //depot/projects/vap/sys/dev/em/e1000_82541.c#4 integrate .. //depot/projects/vap/sys/dev/em/e1000_82542.c#4 integrate .. //depot/projects/vap/sys/dev/em/e1000_82543.c#4 integrate .. //depot/projects/vap/sys/dev/em/e1000_82571.c#4 integrate .. //depot/projects/vap/sys/dev/em/e1000_82571.h#4 integrate .. //depot/projects/vap/sys/dev/em/e1000_api.c#4 integrate .. //depot/projects/vap/sys/dev/em/e1000_api.h#4 integrate .. //depot/projects/vap/sys/dev/em/e1000_defines.h#4 integrate .. //depot/projects/vap/sys/dev/em/e1000_hw.h#4 integrate .. //depot/projects/vap/sys/dev/em/e1000_ich8lan.c#4 integrate .. //depot/projects/vap/sys/dev/em/e1000_ich8lan.h#4 integrate .. //depot/projects/vap/sys/dev/em/e1000_mac.c#4 integrate .. //depot/projects/vap/sys/dev/em/e1000_mac.h#4 integrate .. //depot/projects/vap/sys/dev/em/e1000_manage.c#4 integrate .. //depot/projects/vap/sys/dev/em/e1000_nvm.c#4 integrate .. //depot/projects/vap/sys/dev/em/e1000_nvm.h#4 integrate .. //depot/projects/vap/sys/dev/em/e1000_osdep.c#1 branch .. //depot/projects/vap/sys/dev/em/e1000_osdep.h#4 integrate .. //depot/projects/vap/sys/dev/em/e1000_phy.c#4 integrate .. //depot/projects/vap/sys/dev/em/e1000_phy.h#4 integrate .. //depot/projects/vap/sys/dev/em/if_em.c#7 integrate .. //depot/projects/vap/sys/dev/em/if_em.h#6 integrate .. //depot/projects/vap/sys/dev/igb/e1000_mac.c#2 integrate .. //depot/projects/vap/sys/dev/igb/e1000_osdep.c#1 branch .. //depot/projects/vap/sys/dev/igb/if_igb.c#2 integrate .. //depot/projects/vap/sys/dev/malo/if_malohal.c#3 integrate .. //depot/projects/vap/sys/dev/mpt/mpt.c#5 integrate .. //depot/projects/vap/sys/dev/mxge/if_mxge.c#7 integrate .. //depot/projects/vap/sys/dev/re/if_re.c#10 integrate .. //depot/projects/vap/sys/dev/speaker/spkr.c#3 integrate .. //depot/projects/vap/sys/dev/syscons/syscons.c#9 integrate .. //depot/projects/vap/sys/dev/ti/if_ti.c#5 integrate .. //depot/projects/vap/sys/dev/usb/ubsa.c#6 integrate .. //depot/projects/vap/sys/dev/usb/usbdevs#12 integrate .. //depot/projects/vap/sys/fs/coda/coda_vfsops.c#6 integrate .. //depot/projects/vap/sys/fs/msdosfs/msdosfs_vfsops.c#9 integrate .. //depot/projects/vap/sys/fs/msdosfs/msdosfs_vnops.c#7 integrate .. //depot/projects/vap/sys/fs/nullfs/null_subr.c#7 integrate .. //depot/projects/vap/sys/fs/nullfs/null_vfsops.c#9 integrate .. //depot/projects/vap/sys/fs/tmpfs/tmpfs_vnops.c#5 integrate .. //depot/projects/vap/sys/fs/unionfs/union_vfsops.c#8 integrate .. //depot/projects/vap/sys/geom/geom_subr.c#7 integrate .. //depot/projects/vap/sys/geom/part/g_part.h#5 integrate .. //depot/projects/vap/sys/geom/part/g_part_pc98.c#1 branch .. //depot/projects/vap/sys/gnu/fs/ext2fs/ext2_vfsops.c#5 integrate .. //depot/projects/vap/sys/i386/conf/GENERIC#11 integrate .. //depot/projects/vap/sys/i386/conf/NOTES#9 integrate .. //depot/projects/vap/sys/i386/conf/XBOX#3 integrate .. //depot/projects/vap/sys/i386/i386/busdma_machdep.c#7 integrate .. //depot/projects/vap/sys/i386/i386/pmap.c#9 integrate .. //depot/projects/vap/sys/i386/i386/trap.c#8 integrate .. //depot/projects/vap/sys/i386/ibcs2/ibcs2_fcntl.c#4 integrate .. //depot/projects/vap/sys/i386/ibcs2/ibcs2_util.c#4 integrate .. //depot/projects/vap/sys/i386/include/clock.h#6 integrate .. //depot/projects/vap/sys/i386/include/param.h#5 integrate .. //depot/projects/vap/sys/i386/include/pmap.h#6 integrate .. //depot/projects/vap/sys/i386/include/timerreg.h#3 integrate .. //depot/projects/vap/sys/i386/include/vmparam.h#6 integrate .. //depot/projects/vap/sys/i386/isa/clock.c#7 integrate .. //depot/projects/vap/sys/i386/isa/prof_machdep.c#6 integrate .. //depot/projects/vap/sys/i386/isa/vesa.c#6 integrate .. //depot/projects/vap/sys/i386/linux/linux_sysvec.c#8 integrate .. //depot/projects/vap/sys/ia64/conf/GENERIC#8 integrate .. //depot/projects/vap/sys/ia64/ia64/elf_machdep.c#5 integrate .. //depot/projects/vap/sys/ia64/ia64/machdep.c#11 integrate .. //depot/projects/vap/sys/ia64/ia64/pmap.c#8 integrate .. //depot/projects/vap/sys/ia64/include/clock.h#5 integrate .. //depot/projects/vap/sys/ia64/include/md_var.h#6 integrate .. //depot/projects/vap/sys/ia64/include/param.h#5 integrate .. //depot/projects/vap/sys/isa/syscons_isa.c#5 integrate .. //depot/projects/vap/sys/kern/init_sysent.c#12 integrate .. //depot/projects/vap/sys/kern/kern_clock.c#8 integrate .. //depot/projects/vap/sys/kern/kern_conf.c#8 integrate .. //depot/projects/vap/sys/kern/kern_cpuset.c#4 integrate .. //depot/projects/vap/sys/kern/kern_descrip.c#12 integrate .. //depot/projects/vap/sys/kern/kern_event.c#8 integrate .. //depot/projects/vap/sys/kern/kern_exec.c#8 integrate .. //depot/projects/vap/sys/kern/kern_intr.c#8 integrate .. //depot/projects/vap/sys/kern/kern_jail.c#8 integrate .. //depot/projects/vap/sys/kern/kern_lockf.c#7 integrate .. //depot/projects/vap/sys/kern/kern_rwlock.c#6 integrate .. //depot/projects/vap/sys/kern/kern_timeout.c#9 integrate .. //depot/projects/vap/sys/kern/kern_umtx.c#7 integrate .. //depot/projects/vap/sys/kern/makesyscalls.sh#6 integrate .. //depot/projects/vap/sys/kern/subr_sleepqueue.c#11 integrate .. //depot/projects/vap/sys/kern/syscalls.c#12 integrate .. //depot/projects/vap/sys/kern/syscalls.master#12 integrate .. //depot/projects/vap/sys/kern/systrace_args.c#9 integrate .. //depot/projects/vap/sys/kern/tty_cons.c#8 integrate .. //depot/projects/vap/sys/kern/uipc_mqueue.c#4 integrate .. //depot/projects/vap/sys/kern/vfs_acl.c#5 integrate .. //depot/projects/vap/sys/kern/vfs_bio.c#12 integrate .. //depot/projects/vap/sys/kern/vfs_cache.c#9 integrate .. //depot/projects/vap/sys/kern/vfs_extattr.c#4 integrate .. //depot/projects/vap/sys/kern/vfs_lookup.c#9 integrate .. //depot/projects/vap/sys/kern/vfs_mount.c#10 integrate .. //depot/projects/vap/sys/kern/vfs_subr.c#13 integrate .. //depot/projects/vap/sys/kern/vfs_syscalls.c#9 integrate .. //depot/projects/vap/sys/kern/vfs_vnops.c#8 integrate .. //depot/projects/vap/sys/kern/vnode_if.src#8 integrate .. //depot/projects/vap/sys/modules/Makefile#17 integrate .. //depot/projects/vap/sys/modules/bktr/bktr/Makefile#5 integrate .. //depot/projects/vap/sys/modules/em/Makefile#6 integrate .. //depot/projects/vap/sys/modules/geom/geom_part/Makefile#3 integrate .. //depot/projects/vap/sys/modules/geom/geom_part/geom_part_pc98/Makefile#1 branch .. //depot/projects/vap/sys/modules/igb/Makefile#2 integrate .. //depot/projects/vap/sys/modules/ixgbe/Makefile#3 integrate .. //depot/projects/vap/sys/modules/krpc/Makefile#1 branch .. //depot/projects/vap/sys/modules/nfslockd/Makefile#1 branch .. //depot/projects/vap/sys/modules/sound/driver/emu10kx/Makefile#4 integrate .. //depot/projects/vap/sys/modules/uslcom/Makefile#2 integrate .. //depot/projects/vap/sys/modules/wpi/Makefile#3 integrate .. //depot/projects/vap/sys/modules/zfs/Makefile#5 integrate .. //depot/projects/vap/sys/net/bpf_zerocopy.c#3 integrate .. //depot/projects/vap/sys/net/if.h#7 integrate .. //depot/projects/vap/sys/netgraph/ng_base.c#14 integrate .. //depot/projects/vap/sys/netgraph/ng_car.c#4 integrate .. //depot/projects/vap/sys/netgraph/ng_pptpgre.c#6 integrate .. //depot/projects/vap/sys/netncp/ncp_conn.c#7 integrate .. //depot/projects/vap/sys/netsmb/smb_iod.c#7 integrate .. //depot/projects/vap/sys/nfs4client/nfs4_vnops.c#10 integrate .. //depot/projects/vap/sys/nfsclient/nfs_lock.c#5 integrate .. //depot/projects/vap/sys/nfsclient/nfs_vnops.c#10 integrate .. //depot/projects/vap/sys/nlm/nlm.h#1 branch .. //depot/projects/vap/sys/nlm/nlm_prot.h#1 branch .. //depot/projects/vap/sys/nlm/nlm_prot_clnt.c#1 branch .. //depot/projects/vap/sys/nlm/nlm_prot_impl.c#1 branch .. //depot/projects/vap/sys/nlm/nlm_prot_server.c#1 branch .. //depot/projects/vap/sys/nlm/nlm_prot_svc.c#1 branch .. //depot/projects/vap/sys/nlm/nlm_prot_xdr.c#1 branch .. //depot/projects/vap/sys/nlm/sm_inter.h#1 branch .. //depot/projects/vap/sys/nlm/sm_inter_xdr.c#1 branch .. //depot/projects/vap/sys/pc98/cbus/clock.c#3 integrate .. //depot/projects/vap/sys/pc98/cbus/syscons_cbus.c#3 integrate .. //depot/projects/vap/sys/pc98/conf/GENERIC#8 integrate .. //depot/projects/vap/sys/pc98/conf/NOTES#7 integrate .. //depot/projects/vap/sys/pc98/include/clock.h#3 integrate .. //depot/projects/vap/sys/pc98/include/timerreg.h#3 integrate .. //depot/projects/vap/sys/pci/if_rlreg.h#9 integrate .. //depot/projects/vap/sys/powerpc/aim/clock.c#2 integrate .. //depot/projects/vap/sys/powerpc/booke/clock.c#2 integrate .. //depot/projects/vap/sys/powerpc/conf/GENERIC#8 integrate .. //depot/projects/vap/sys/powerpc/include/asm.h#3 integrate .. //depot/projects/vap/sys/powerpc/include/clock.h#5 integrate .. //depot/projects/vap/sys/powerpc/include/param.h#5 integrate .. //depot/projects/vap/sys/powerpc/psim/openpic_iobus.c#7 integrate .. //depot/projects/vap/sys/rpc/auth.h#1 branch .. //depot/projects/vap/sys/rpc/auth_none.c#1 branch .. //depot/projects/vap/sys/rpc/auth_unix.c#1 branch .. //depot/projects/vap/sys/rpc/authunix_prot.c#1 branch .. //depot/projects/vap/sys/rpc/clnt.h#1 branch .. //depot/projects/vap/sys/rpc/clnt_dg.c#1 branch .. //depot/projects/vap/sys/rpc/clnt_rc.c#1 branch .. //depot/projects/vap/sys/rpc/clnt_stat.h#1 branch .. //depot/projects/vap/sys/rpc/clnt_vc.c#1 branch .. //depot/projects/vap/sys/rpc/getnetconfig.c#1 branch .. //depot/projects/vap/sys/rpc/inet_ntop.c#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Apr 3 21:21:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 920BF1065670; Thu, 3 Apr 2008 21:21:46 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5085B106564A for ; Thu, 3 Apr 2008 21:21:46 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 37E488FC14 for ; Thu, 3 Apr 2008 21:21:46 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m33LLkhI030250 for ; Thu, 3 Apr 2008 21:21:46 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m33LLkQv030248 for perforce@freebsd.org; Thu, 3 Apr 2008 21:21:46 GMT (envelope-from thompsa@freebsd.org) Date: Thu, 3 Apr 2008 21:21:46 GMT Message-Id: <200804032121.m33LLkQv030248@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 139296 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Apr 2008 21:21:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=139296 Change 139296 by thompsa@thompsa_burger on 2008/04/03 21:20:49 The ieee80211com struct must be first or bad things happen. Affected files ... .. //depot/projects/vap/sys/dev/ipw/if_ipwvar.h#7 edit .. //depot/projects/vap/sys/dev/iwi/if_iwivar.h#9 edit .. //depot/projects/vap/sys/dev/iwn/if_iwnvar.h#4 edit .. //depot/projects/vap/sys/dev/ral/rt2560var.h#15 edit .. //depot/projects/vap/sys/dev/ral/rt2661var.h#11 edit .. //depot/projects/vap/sys/dev/wpi/if_wpivar.h#5 edit Differences ... ==== //depot/projects/vap/sys/dev/ipw/if_ipwvar.h#7 (text+ko) ==== @@ -85,8 +85,8 @@ #define IPW_VAP(vap) ((struct ipw_vap *)(vap)) struct ipw_softc { + struct ieee80211com sc_ic; /* NB: must be first */ struct ifnet *sc_ifp; - struct ieee80211com sc_ic; device_t sc_dev; struct mtx sc_mtx; ==== //depot/projects/vap/sys/dev/iwi/if_iwivar.h#9 (text+ko) ==== @@ -123,8 +123,8 @@ #define IWI_VAP(vap) ((struct iwi_vap *)(vap)) struct iwi_softc { + struct ieee80211com sc_ic; /* NB: must be first */ struct ifnet *sc_ifp; - struct ieee80211com sc_ic; void (*sc_node_free)(struct ieee80211_node *); device_t sc_dev; ==== //depot/projects/vap/sys/dev/iwn/if_iwnvar.h#4 (text+kox) ==== @@ -136,7 +136,7 @@ #define IWN_VAP(_vap) ((struct iwn_vap *)(_vap)) struct iwn_softc { - struct ieee80211com sc_ic; + struct ieee80211com sc_ic; /* NB: must be first */ struct ifnet *sc_ifp; int sc_debug; struct callout sc_timer_to; /* calib+watchdog timer */ ==== //depot/projects/vap/sys/dev/ral/rt2560var.h#15 (text) ==== @@ -110,7 +110,7 @@ #define RT2560_VAP(vap) ((struct rt2560_vap *)(vap)) struct rt2560_softc { - struct ieee80211com sc_ic; + struct ieee80211com sc_ic; /* NB: must be first */ struct ifnet *sc_ifp; device_t sc_dev; bus_space_tag_t sc_st; ==== //depot/projects/vap/sys/dev/ral/rt2661var.h#11 (text) ==== @@ -102,7 +102,7 @@ #define RT2661_VAP(vap) ((struct rt2661_vap *)(vap)) struct rt2661_softc { - struct ieee80211com sc_ic; + struct ieee80211com sc_ic; /* NB: must be first */ struct ifnet *sc_ifp; device_t sc_dev; bus_space_tag_t sc_st; ==== //depot/projects/vap/sys/dev/wpi/if_wpivar.h#5 (text+ko) ==== @@ -135,9 +135,9 @@ #define WPI_VAP(vap) ((struct wpi_vap *)(vap)) struct wpi_softc { + struct ieee80211com sc_ic; /* NB: must be first */ device_t sc_dev; struct ifnet *sc_ifp; - struct ieee80211com sc_ic; struct mtx sc_mtx; /* Flags indicating the current state the driver From owner-p4-projects@FreeBSD.ORG Thu Apr 3 21:28:54 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2096A106566C; Thu, 3 Apr 2008 21:28:54 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D7192106564A for ; Thu, 3 Apr 2008 21:28:53 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A8A528FC0C for ; Thu, 3 Apr 2008 21:28:53 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m33LSroe030878 for ; Thu, 3 Apr 2008 21:28:53 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m33LSrBQ030876 for perforce@freebsd.org; Thu, 3 Apr 2008 21:28:53 GMT (envelope-from gonzo@FreeBSD.org) Date: Thu, 3 Apr 2008 21:28:53 GMT Message-Id: <200804032128.m33LSrBQ030876@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 139297 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Apr 2008 21:28:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=139297 Change 139297 by gonzo@gonzo_jeeves on 2008/04/03 21:28:11 o Remove onsoleted (and unneccessary) #include Pointed out by: Naoki Hamada Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/adm5120/adm5120_machdep.c#4 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/adm5120/adm5120_machdep.c#4 (text+ko) ==== @@ -65,7 +65,6 @@ #include #include #include -#include #include #include From owner-p4-projects@FreeBSD.ORG Thu Apr 3 21:32:58 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4041F1065672; Thu, 3 Apr 2008 21:32:58 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0253E106564A for ; Thu, 3 Apr 2008 21:32:58 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E15B78FC0C for ; Thu, 3 Apr 2008 21:32:57 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m33LWvtP031239 for ; Thu, 3 Apr 2008 21:32:57 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m33LWvTM031237 for perforce@freebsd.org; Thu, 3 Apr 2008 21:32:57 GMT (envelope-from gonzo@FreeBSD.org) Date: Thu, 3 Apr 2008 21:32:57 GMT Message-Id: <200804032132.m33LWvTM031237@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 139298 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Apr 2008 21:32:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=139298 Change 139298 by gonzo@gonzo_jeeves on 2008/04/03 21:32:28 o Conform new intr_event_create API. Pointed out by: Naoki Hamada Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/adm5120/obio.c#2 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/adm5120/obio.c#2 (text+ko) ==== @@ -321,7 +321,8 @@ event = sc->sc_eventstab[irq]; if (event == NULL) { error = intr_event_create(&event, (void *)irq, 0, - (void (*)(void *))NULL, "obio intr%d:", irq); + (mask_fn)mips_mask_irq, (mask_fn)mips_unmask_irq, + NULL, NULL, "obio intr%d:", irq); sc->sc_eventstab[irq] = event; } From owner-p4-projects@FreeBSD.ORG Thu Apr 3 22:04:34 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D6FA51065672; Thu, 3 Apr 2008 22:04:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 80252106566B for ; Thu, 3 Apr 2008 22:04:33 +0000 (UTC) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 697778FC12 for ; Thu, 3 Apr 2008 22:04:33 +0000 (UTC) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m33M4XRk036369 for ; Thu, 3 Apr 2008 22:04:33 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m33M4XtK036367 for perforce@freebsd.org; Thu, 3 Apr 2008 22:04:33 GMT (envelope-from wsalamon@computer.org) Date: Thu, 3 Apr 2008 22:04:33 GMT Message-Id: <200804032204.m33M4XtK036367@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 139301 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Apr 2008 22:04:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=139301 Change 139301 by wsalamon@vh2 on 2008/04/03 22:04:26 Integrate from vendor branch, picking up latest build fixes. Affected files ... .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/bus_space_generic.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/machdep.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/kb920x_machdep.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/machdep.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/sa11x0/assabet_machdep.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/sa11x0/files.sa11x0#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/sa11x0/sa11x0_io.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i80321/ep80219_machdep.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i80321/files.ep80219#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i80321/files.i80219#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i80321/files.i80321#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i80321/files.iq31244#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i80321/obio_space.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i8134x/crb_machdep.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i8134x/obio_space.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/ixp425/avila_machdep.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/ixp425/files.avila#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/ixp425/files.ixp425#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/ixp425/ixp425_a4x_space.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/ixp425/ixp425_space.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/conf/Makefile.arm#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/conf/files#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/igb/if_igb.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mpt/mpt.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_umtx.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/include/asm.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/psim/openpic_iobus.c#3 integrate Differences ... ==== //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/machdep.c#3 (text+ko) ==== @@ -43,8 +43,10 @@ */ #include "opt_compat.h" +#include "opt_ddb.h" + #include -__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.29 2008/03/16 10:58:02 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.30 2008/04/03 16:44:49 imp Exp $"); #include #include @@ -101,6 +103,11 @@ int _min_memcpy_size = 0; int _min_bzero_size = 0; +extern int *end; +#ifdef DDB +extern vm_offset_t ksym_start, ksym_end; +#endif + void sendsig(catcher, ksi, mask) sig_t catcher; @@ -631,3 +638,53 @@ pcb->un_32.pcb32_lr = tf->tf_usr_lr; pcb->un_32.pcb32_sp = tf->tf_usr_sp; } + +/* + * Fake up a boot descriptor table + */ +vm_offset_t +fake_preload_metadata(void) +{ +#ifdef DDB + vm_offset_t zstart = 0, zend = 0; +#endif + vm_offset_t lastaddr; + int i = 0; + static uint32_t fake_preload[35]; + + fake_preload[i++] = MODINFO_NAME; + fake_preload[i++] = strlen("elf kernel") + 1; + strcpy((char*)&fake_preload[i++], "elf kernel"); + i += 2; + fake_preload[i++] = MODINFO_TYPE; + fake_preload[i++] = strlen("elf kernel") + 1; + strcpy((char*)&fake_preload[i++], "elf kernel"); + i += 2; + fake_preload[i++] = MODINFO_ADDR; + fake_preload[i++] = sizeof(vm_offset_t); + fake_preload[i++] = KERNVIRTADDR; + fake_preload[i++] = MODINFO_SIZE; + fake_preload[i++] = sizeof(uint32_t); + fake_preload[i++] = (uint32_t)&end - KERNVIRTADDR; +#ifdef DDB + if (*(uint32_t *)KERNVIRTADDR == MAGIC_TRAMP_NUMBER) { + fake_preload[i++] = MODINFO_METADATA|MODINFOMD_SSYM; + fake_preload[i++] = sizeof(vm_offset_t); + fake_preload[i++] = *(uint32_t *)(KERNVIRTADDR + 4); + fake_preload[i++] = MODINFO_METADATA|MODINFOMD_ESYM; + fake_preload[i++] = sizeof(vm_offset_t); + fake_preload[i++] = *(uint32_t *)(KERNVIRTADDR + 8); + lastaddr = *(uint32_t *)(KERNVIRTADDR + 8); + zend = lastaddr; + zstart = *(uint32_t *)(KERNVIRTADDR + 4); + ksym_start = zstart; + ksym_end = zend; + } else +#endif + lastaddr = (vm_offset_t)&end; + fake_preload[i++] = 0; + fake_preload[i] = 0; + preload_metadata = (void *)fake_preload; + + return (lastaddr); +} ==== //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/kb920x_machdep.c#2 (text) ==== @@ -44,11 +44,10 @@ */ #include "opt_msgbuf.h" -#include "opt_ddb.h" #include "opt_at91.h" #include -__FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.28 2007/12/23 23:31:27 stas Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.30 2008/04/03 16:44:49 imp Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -187,12 +186,6 @@ } }; -#define SDRAM_START 0xa0000000 - -#ifdef DDB -extern vm_offset_t ksym_start, ksym_end; -#endif - static long ramsize(void) { @@ -257,62 +250,18 @@ initarm(void *arg, void *arg2) { struct pv_addr kernel_l1pt; - int loop; + int loop, i; u_int l1pagetable; vm_offset_t freemempos; vm_offset_t afterkern; - int i; - uint32_t fake_preload[35]; uint32_t memsize; vm_offset_t lastaddr; -#ifdef DDB - vm_offset_t zstart = 0, zend = 0; -#endif - - i = 0; set_cpufuncs(); - - fake_preload[i++] = MODINFO_NAME; - fake_preload[i++] = strlen("elf kernel") + 1; - strcpy((char*)&fake_preload[i++], "elf kernel"); - i += 2; - fake_preload[i++] = MODINFO_TYPE; - fake_preload[i++] = strlen("elf kernel") + 1; - strcpy((char*)&fake_preload[i++], "elf kernel"); - i += 2; - fake_preload[i++] = MODINFO_ADDR; - fake_preload[i++] = sizeof(vm_offset_t); - fake_preload[i++] = KERNVIRTADDR; - fake_preload[i++] = MODINFO_SIZE; - fake_preload[i++] = sizeof(uint32_t); - fake_preload[i++] = (uint32_t)&end - KERNVIRTADDR; -#ifdef DDB - if (*(uint32_t *)KERNVIRTADDR == MAGIC_TRAMP_NUMBER) { - fake_preload[i++] = MODINFO_METADATA|MODINFOMD_SSYM; - fake_preload[i++] = sizeof(vm_offset_t); - fake_preload[i++] = *(uint32_t *)(KERNVIRTADDR + 4); - fake_preload[i++] = MODINFO_METADATA|MODINFOMD_ESYM; - fake_preload[i++] = sizeof(vm_offset_t); - fake_preload[i++] = *(uint32_t *)(KERNVIRTADDR + 8); - lastaddr = *(uint32_t *)(KERNVIRTADDR + 8); - zend = lastaddr; - zstart = *(uint32_t *)(KERNVIRTADDR + 4); - ksym_start = zstart; - ksym_end = zend; - } else -#endif - lastaddr = (vm_offset_t)&end; - - fake_preload[i++] = 0; - fake_preload[i] = 0; - preload_metadata = (void *)fake_preload; - - + lastaddr = fake_preload_metadata(); pcpu_init(pcpup, 0, sizeof(struct pcpu)); PCPU_SET(curthread, &thread0); -#define KERNEL_TEXT_BASE (KERNBASE) freemempos = (lastaddr + PAGE_MASK) & ~PAGE_MASK; /* Define a macro to simplify memory allocation */ #define valloc_pages(var, np) \ @@ -368,7 +317,7 @@ pmap_link_l2pt(l1pagetable, KERNBASE + i * 0x100000, &kernel_pt_table[KERNEL_PT_KERN + i]); pmap_map_chunk(l1pagetable, KERNBASE, PHYSADDR, - (((uint32_t)(lastaddr) - KERNBASE) + PAGE_SIZE) & ~(PAGE_SIZE - 1), + (((uint32_t)lastaddr - KERNBASE) + PAGE_SIZE) & ~(PAGE_SIZE - 1), VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); afterkern = round_page((lastaddr + L1_S_SIZE) & ~(L1_S_SIZE - 1)); ==== //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/machdep.h#2 (text+ko) ==== @@ -1,15 +1,15 @@ /* $NetBSD: machdep.h,v 1.7 2002/02/21 02:52:21 thorpej Exp $ */ -/* $FreeBSD: src/sys/arm/include/machdep.h,v 1.2 2005/02/26 18:59:01 cognet Exp $ */ +/* $FreeBSD: src/sys/arm/include/machdep.h,v 1.3 2008/04/03 16:44:49 imp Exp $ */ #ifndef _MACHDEP_BOOT_MACHDEP_H_ #define _MACHDEP_BOOT_MACHDEP_H_ /* misc prototypes used by the many arm machdeps */ -void halt (void); -void data_abort_handler (trapframe_t *); -void prefetch_abort_handler (trapframe_t *); -void undefinedinstruction_bounce (trapframe_t *); - void arm_lock_cache_line(vm_offset_t); +vm_offset_t fake_preload_metadata(void); +void halt(void); +void data_abort_handler(trapframe_t *); +void prefetch_abort_handler(trapframe_t *); +void undefinedinstruction_bounce(trapframe_t *); #endif /* !_MACHINE_MACHDEP_H_ */ ==== //depot/projects/trustedbsd/audit_mac/src/sys/arm/sa11x0/assabet_machdep.c#2 (text+ko) ==== @@ -47,7 +47,7 @@ #include -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.22 2007/11/05 11:36:10 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.23 2008/04/03 16:44:50 imp Exp $"); #include "opt_md.h" @@ -217,58 +217,25 @@ u_int l1pagetable; vm_offset_t freemempos; vm_offset_t lastalloced; + vm_offset_t lastaddr; vm_size_t pt_size; - int i = 0; - uint32_t fake_preload[35]; uint32_t memsize = 32 * 1024 * 1024; sa1110_uart_vaddr = SACOM1_VBASE; boothowto = RB_VERBOSE | RB_SINGLE; cninit(); set_cpufuncs(); - fake_preload[i++] = MODINFO_NAME; - fake_preload[i++] = strlen("elf kernel") + 1; - strcpy((char*)&fake_preload[i++], "elf kernel"); - i += 2; - fake_preload[i++] = MODINFO_TYPE; - fake_preload[i++] = strlen("elf kernel") + 1; - strcpy((char*)&fake_preload[i++], "elf kernel"); - i += 2; - fake_preload[i++] = MODINFO_ADDR; - fake_preload[i++] = sizeof(vm_offset_t); - fake_preload[i++] = KERNBASE; - fake_preload[i++] = MODINFO_SIZE; - fake_preload[i++] = sizeof(uint32_t); - fake_preload[i++] = (uint32_t)&end - KERNBASE; - fake_preload[i++] = MODINFO_NAME; - fake_preload[i++] = strlen("md root") + 1; - strcpy((char*)&fake_preload[i++], "md root"); - i += 1; - fake_preload[i++] = MODINFO_TYPE; - fake_preload[i++] = strlen("md_image") + 1; - strcpy((char*)&fake_preload[i++], "md_image"); - i += 2; - fake_preload[i++] = MODINFO_ADDR; - fake_preload[i++] = sizeof(uint32_t); - fake_preload[i++] = MDROOT_ADDR; - fake_preload[i++] = MODINFO_SIZE; - fake_preload[i++] = sizeof(uint32_t); - fake_preload[i++] = MD_ROOT_SIZE * 1024; - fake_preload[i++] = 0; - fake_preload[i] = 0; - preload_metadata = (void *)fake_preload; - + lastaddr = fake_reload_metadata(); physmem = memsize / PAGE_SIZE; pc = &__pcpu; pcpu_init(pc, 0, sizeof(struct pcpu)); PCPU_SET(curthread, &thread0); physical_start = (vm_offset_t) KERNBASE; - physical_end = (vm_offset_t) &end; + physical_end = lastaddr; physical_freestart = (((vm_offset_t)physical_end) + PAGE_MASK) & ~PAGE_MASK; md_addr.pv_va = md_addr.pv_pa = MDROOT_ADDR; -#define KERNEL_TEXT_BASE (KERNBASE + 0x00040000) - kerneldatasize = (u_int32_t)&end - (u_int32_t)KERNEL_TEXT_BASE; + kerneldatasize = (u_int32_t)&end - (u_int32_t)KERNVIRTADDR; symbolsize = 0; freemempos = (vm_offset_t)round_page(physical_freestart); memset((void *)freemempos, 0, 256*1024); @@ -348,7 +315,8 @@ pmap_link_l2pt(l1pagetable, KERNEL_VM_BASE + loop * 0x00100000, &kernel_pt_table[KERNEL_PT_VMDATA + loop]); pmap_map_chunk(l1pagetable, KERNBASE, KERNBASE, - ((uint32_t)&end - KERNBASE), VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); + ((uint32_t)lastaddr - KERNBASE), VM_PROT_READ|VM_PROT_WRITE, + PTE_CACHE); /* Map the stack pages */ pmap_map_chunk(l1pagetable, irqstack.pv_va, irqstack.pv_pa, IRQ_STACK_SIZE * PAGE_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); @@ -403,8 +371,6 @@ set_stackptr(PSR_UND32_MODE, undstack.pv_va + UND_STACK_SIZE * PAGE_SIZE); - - /* * We must now clean the cache again.... * Cleaning may be done by reading new data to displace any @@ -417,7 +383,6 @@ */ cpu_idcache_wbinv_all(); - bootverbose = 1; /* Set stack for exception handlers */ @@ -443,8 +408,7 @@ dump_avail[3] = phys_avail[3] = 0; mutex_init(); - pmap_bootstrap(freemempos, - 0xd0000000, &kernel_l1pt); + pmap_bootstrap(freemempos, 0xd0000000, &kernel_l1pt); /* Do basic tuning, hz etc */ init_param1(); ==== //depot/projects/trustedbsd/audit_mac/src/sys/arm/sa11x0/files.sa11x0#2 (text+ko) ==== @@ -1,4 +1,5 @@ -# $FreeBSD: src/sys/arm/sa11x0/files.sa11x0,v 1.3 2007/12/02 13:12:21 cognet Exp $ +# $FreeBSD: src/sys/arm/sa11x0/files.sa11x0,v 1.4 2008/04/03 18:22:07 raj Exp $ +arm/arm/bus_space_generic.c standard arm/arm/cpufunc_asm_sa1.S standard arm/arm/cpufunc_asm_sa11x0.S standard arm/sa11x0/assabet_machdep.c optional assabet ==== //depot/projects/trustedbsd/audit_mac/src/sys/arm/sa11x0/sa11x0_io.c#2 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_io.c,v 1.10 2006/11/20 13:21:02 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_io.c,v 1.11 2008/04/03 18:22:07 raj Exp $"); #include #include #include @@ -58,6 +58,7 @@ /* Proto types for all the bus_space structure functions */ +bs_protos(generic); bs_protos(sa11x0); /* Declare the sa11x0 bus space tag */ @@ -67,16 +68,16 @@ NULL, /* mapping/unmapping */ - sa11x0_bs_map, - sa11x0_bs_unmap, - sa11x0_bs_subregion, + generic_bs_map, + generic_bs_unmap, + generic_bs_subregion, /* allocation/deallocation */ - sa11x0_bs_alloc, - sa11x0_bs_free, + generic_bs_alloc, + generic_bs_free, /* barrier */ - sa11x0_bs_barrier, + generic_bs_barrier, /* read (single) */ sa11x0_bs_r_1, @@ -132,118 +133,4 @@ NULL, }; -/* bus space functions */ - -int -sa11x0_bs_map(t, bpa, size, cacheable, bshp) - void *t; - bus_addr_t bpa; - bus_size_t size; - int cacheable; - bus_space_handle_t *bshp; -{ - u_long startpa, endpa, pa; - vm_offset_t va; - pt_entry_t *pte; - const struct pmap_devmap *pd; - - if ((pd = pmap_devmap_find_pa(bpa, size)) != NULL) { - /* Device was statically mapped. */ - *bshp = pd->pd_va + (bpa - pd->pd_pa); - return 0; - } - - startpa = trunc_page(bpa); - endpa = round_page(bpa + size); - - /* XXX use extent manager to check duplicate mapping */ - - va = kmem_alloc(kernel_map, endpa - startpa); - if (! va) - return(ENOMEM); - - *bshp = (bus_space_handle_t)(va + (bpa - startpa)); - - for(pa = startpa; pa < endpa; pa += PAGE_SIZE, va += PAGE_SIZE) { - pmap_kenter(va, pa); - pte = vtopte(va); - if (cacheable == 0) { - *pte &= ~L2_S_CACHE_MASK; - PTE_SYNC(pte); - } - } - return(0); -} - -int -sa11x0_bs_alloc(t, rstart, rend, size, alignment, boundary, cacheable, - bpap, bshp) - void *t; - bus_addr_t rstart, rend; - bus_size_t size, alignment, boundary; - int cacheable; - bus_addr_t *bpap; - bus_space_handle_t *bshp; -{ - panic("sa11x0_alloc(): Help!"); -} - - -void -sa11x0_bs_unmap(t, h, size) - void *t; - bus_space_handle_t h; - bus_size_t size; -{ - vm_offset_t va, endva; - - if (pmap_devmap_find_va((vm_offset_t)t, size) != NULL) { - /* Device was statically mapped; nothing to do. */ - return; - } - - va = trunc_page((vm_offset_t)t); - endva = round_page((vm_offset_t)t + size); - - while (va < endva) { - pmap_kremove(va); - va += PAGE_SIZE; - } - kmem_free(kernel_map, va, endva - va); -} - -void -sa11x0_bs_free(t, bsh, size) - void *t; - bus_space_handle_t bsh; - bus_size_t size; -{ - - panic("sa11x0_free(): Help!"); - /* sa11x0_unmap() does all that we need to do. */ -/* sa11x0_unmap(t, bsh, size);*/ -} - -int -sa11x0_bs_subregion(t, bsh, offset, size, nbshp) - void *t; - bus_space_handle_t bsh; - bus_size_t offset, size; - bus_space_handle_t *nbshp; -{ - - *nbshp = bsh + offset; - return (0); -} - -void -sa11x0_bs_barrier(t, bsh, offset, len, flags) - void *t; - bus_space_handle_t bsh; - bus_size_t offset, len; - int flags; -{ -/* NULL */ -} - /* End of sa11x0_io.c */ ==== //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i80321/ep80219_machdep.c#2 (text+ko) ==== @@ -46,10 +46,9 @@ */ #include "opt_msgbuf.h" -#include "opt_ddb.h" #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/ep80219_machdep.c,v 1.8 2007/11/05 11:36:10 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/ep80219_machdep.c,v 1.9 2008/04/03 16:44:50 imp Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -186,73 +185,26 @@ } }; -#ifdef DDB -extern vm_offset_t ksym_start, ksym_end; -#endif - extern vm_offset_t xscale_cache_clean_addr; void * initarm(void *arg, void *arg2) { struct pv_addr kernel_l1pt; - int loop; + int loop, i; u_int l1pagetable; vm_offset_t freemempos; vm_offset_t freemem_pt; vm_offset_t afterkern; vm_offset_t freemem_after; vm_offset_t lastaddr; -#ifdef DDB - vm_offset_t zstart = 0, zend = 0; -#endif - int i = 0; - uint32_t fake_preload[35]; uint32_t memsize, memstart; - i = 0; - set_cpufuncs(); - fake_preload[i++] = MODINFO_NAME; - fake_preload[i++] = strlen("elf kernel") + 1; - strcpy((char*)&fake_preload[i++], "elf kernel"); - i += 2; - fake_preload[i++] = MODINFO_TYPE; - fake_preload[i++] = strlen("elf kernel") + 1; - strcpy((char*)&fake_preload[i++], "elf kernel"); - i += 2; - fake_preload[i++] = MODINFO_ADDR; - fake_preload[i++] = sizeof(vm_offset_t); - fake_preload[i++] = KERNBASE + 0x00200000; - fake_preload[i++] = MODINFO_SIZE; - fake_preload[i++] = sizeof(uint32_t); - fake_preload[i++] = (uint32_t)&end - KERNBASE - 0x00200000; -#ifdef DDB - if (*(uint32_t *)KERNVIRTADDR == MAGIC_TRAMP_NUMBER) { - fake_preload[i++] = MODINFO_METADATA|MODINFOMD_SSYM; - fake_preload[i++] = sizeof(vm_offset_t); - fake_preload[i++] = *(uint32_t *)(KERNVIRTADDR + 4); - fake_preload[i++] = MODINFO_METADATA|MODINFOMD_ESYM; - fake_preload[i++] = sizeof(vm_offset_t); - fake_preload[i++] = *(uint32_t *)(KERNVIRTADDR + 8); - lastaddr = *(uint32_t *)(KERNVIRTADDR + 8); - zend = lastaddr; - zstart = *(uint32_t *)(KERNVIRTADDR + 4); - ksym_start = zstart; - ksym_end = zend; - } else -#endif - lastaddr = (vm_offset_t)&end; - - fake_preload[i++] = 0; - fake_preload[i] = 0; - preload_metadata = (void *)fake_preload; - - + lastaddr = fake_preload_metadata(); pcpu_init(pcpup, 0, sizeof(struct pcpu)); PCPU_SET(curthread, &thread0); -#define KERNEL_TEXT_BASE (KERNBASE + 0x00200000) freemempos = 0xa0200000; /* Define a macro to simplify memory allocation */ #define valloc_pages(var, np) \ @@ -437,9 +389,6 @@ /* Enable MMU, I-cache, D-cache, write buffer. */ arm_vector_init(ARM_VECTORS_HIGH, ARM_VEC_ALL); - - - pmap_curmaxkvaddr = afterkern + PAGE_SIZE; dump_avail[0] = 0xa0000000; dump_avail[1] = 0xa0000000 + memsize; ==== //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i80321/files.ep80219#2 (text+ko) ==== @@ -1,8 +1,9 @@ -#$FreeBSD: src/sys/arm/xscale/i80321/files.ep80219,v 1.1 2006/08/24 23:51:28 cognet Exp $ +#$FreeBSD: src/sys/arm/xscale/i80321/files.ep80219,v 1.2 2008/04/03 18:22:07 raj Exp $ # # # EP80219 Board Specific # +arm/arm/bus_space_generic.c standard arm/xscale/i80321/iq80321.c standard arm/xscale/i80321/ep80219_machdep.c standard arm/xscale/i80321/obio.c standard ==== //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i80321/files.i80219#2 (text+ko) ==== @@ -1,7 +1,8 @@ -#$FreeBSD: src/sys/arm/xscale/i80321/files.i80219,v 1.1 2006/08/24 23:51:28 cognet Exp $ +#$FreeBSD: src/sys/arm/xscale/i80321/files.i80219,v 1.2 2008/04/03 18:22:07 raj Exp $ # # IOP Specific # +arm/arm/bus_space_generic.c standard arm/arm/cpufunc_asm_xscale.S standard arm/arm/irq_dispatch.S standard arm/xscale/i80321/i80321.c standard ==== //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i80321/files.i80321#2 (text+ko) ==== @@ -1,4 +1,5 @@ -#$FreeBSD: src/sys/arm/xscale/i80321/files.i80321,v 1.3 2005/10/03 14:19:55 cognet Exp $ +#$FreeBSD: src/sys/arm/xscale/i80321/files.i80321,v 1.4 2008/04/03 18:22:07 raj Exp $ +arm/arm/bus_space_generic.c standard arm/arm/cpufunc_asm_xscale.S standard arm/arm/irq_dispatch.S standard arm/xscale/i80321/i80321.c standard ==== //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i80321/files.iq31244#2 (text+ko) ==== @@ -1,4 +1,5 @@ -#$FreeBSD: src/sys/arm/xscale/i80321/files.iq31244,v 1.2 2005/01/15 18:55:22 cognet Exp $ +#$FreeBSD: src/sys/arm/xscale/i80321/files.iq31244,v 1.3 2008/04/03 18:22:07 raj Exp $ +arm/arm/bus_space_generic.c standard arm/xscale/i80321/iq80321.c standard arm/xscale/i80321/iq31244_machdep.c standard arm/xscale/i80321/iq31244_7seg.c optional iq31244_7seg ==== //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i80321/iq31244_machdep.c#2 (text+ko) ==== @@ -46,10 +46,9 @@ */ #include "opt_msgbuf.h" -#include "opt_ddb.h" #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/iq31244_machdep.c,v 1.29 2007/11/05 11:36:10 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/iq31244_machdep.c,v 1.30 2008/04/03 16:44:50 imp Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -187,73 +186,26 @@ #define SDRAM_START 0xa0000000 -#ifdef DDB -extern vm_offset_t ksym_start, ksym_end; -#endif - extern vm_offset_t xscale_cache_clean_addr; void * initarm(void *arg, void *arg2) { struct pv_addr kernel_l1pt; - int loop; + int loop, i; u_int l1pagetable; vm_offset_t freemempos; vm_offset_t freemem_pt; vm_offset_t afterkern; vm_offset_t freemem_after; vm_offset_t lastaddr; -#ifdef DDB - vm_offset_t zstart = 0, zend = 0; -#endif - int i; - uint32_t fake_preload[35]; uint32_t memsize, memstart; - i = 0; - set_cpufuncs(); - fake_preload[i++] = MODINFO_NAME; - fake_preload[i++] = strlen("elf kernel") + 1; - strcpy((char*)&fake_preload[i++], "elf kernel"); - i += 2; - fake_preload[i++] = MODINFO_TYPE; - fake_preload[i++] = strlen("elf kernel") + 1; - strcpy((char*)&fake_preload[i++], "elf kernel"); - i += 2; - fake_preload[i++] = MODINFO_ADDR; - fake_preload[i++] = sizeof(vm_offset_t); - fake_preload[i++] = KERNBASE + 0x00200000; - fake_preload[i++] = MODINFO_SIZE; - fake_preload[i++] = sizeof(uint32_t); - fake_preload[i++] = (uint32_t)&end - KERNBASE - 0x00200000; -#ifdef DDB - if (*(uint32_t *)KERNVIRTADDR == MAGIC_TRAMP_NUMBER) { - fake_preload[i++] = MODINFO_METADATA|MODINFOMD_SSYM; - fake_preload[i++] = sizeof(vm_offset_t); - fake_preload[i++] = *(uint32_t *)(KERNVIRTADDR + 4); - fake_preload[i++] = MODINFO_METADATA|MODINFOMD_ESYM; - fake_preload[i++] = sizeof(vm_offset_t); - fake_preload[i++] = *(uint32_t *)(KERNVIRTADDR + 8); - lastaddr = *(uint32_t *)(KERNVIRTADDR + 8); - zend = lastaddr; - zstart = *(uint32_t *)(KERNVIRTADDR + 4); - ksym_start = zstart; - ksym_end = zend; - } else -#endif - lastaddr = (vm_offset_t)&end; - - fake_preload[i++] = 0; - fake_preload[i] = 0; - preload_metadata = (void *)fake_preload; - - + lastaddr = fake_preload_metadata(); pcpu_init(pcpup, 0, sizeof(struct pcpu)); PCPU_SET(curthread, &thread0); -#define KERNEL_TEXT_BASE (KERNBASE + 0x00200000) freemempos = 0xa0200000; /* Define a macro to simplify memory allocation */ #define valloc_pages(var, np) \ ==== //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i80321/obio_space.c#2 (text+ko) ==== @@ -40,23 +40,15 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/obio_space.c,v 1.4 2006/11/20 13:21:02 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/obio_space.c,v 1.5 2008/04/03 18:22:07 raj Exp $"); #include #include #include -#include - -#include -#include -#include -#include - #include /* Prototypes for all the bus_space structure functions */ -bs_protos(obio); bs_protos(generic); bs_protos(generic_armv4); @@ -69,16 +61,16 @@ (void *) 0, /* mapping/unmapping */ - obio_bs_map, - obio_bs_unmap, - obio_bs_subregion, + generic_bs_map, + generic_bs_unmap, + generic_bs_subregion, /* allocation/deallocation */ - obio_bs_alloc, - obio_bs_free, + generic_bs_alloc, + generic_bs_free, /* barrier */ - obio_bs_barrier, + generic_bs_barrier, /* read (single) */ generic_bs_r_1, @@ -134,92 +126,3 @@ NULL, NULL, }; - -int -obio_bs_map(void *t, bus_addr_t bpa, bus_size_t size, int flags, - bus_space_handle_t *bshp) -{ - const struct pmap_devmap *pd; - vm_paddr_t startpa, endpa, pa, offset; - vm_offset_t va; - pt_entry_t *pte; - - if ((pd = pmap_devmap_find_pa(bpa, size)) != NULL) { - /* Device was statically mapped. */ - *bshp = pd->pd_va + (bpa - pd->pd_pa); - return (0); - } - - endpa = round_page(bpa + size); - offset = bpa & PAGE_MASK; - startpa = trunc_page(bpa); - - va = kmem_alloc(kernel_map, endpa - startpa); - if (va == 0) - return (ENOMEM); - - *bshp = va + offset; - - for (pa = startpa; pa < endpa; pa += PAGE_SIZE, va += PAGE_SIZE) { - pmap_kenter(va, pa); - pte = vtopte(va); - *pte &= ~L2_S_CACHE_MASK; - PTE_SYNC(pte); - } - - return (0); -} - -int -obio_bs_alloc(void *t, bus_addr_t rstart, bus_addr_t rend, bus_size_t size, - bus_size_t alignment, bus_size_t boundary, int flags, bus_addr_t *bpap, - bus_space_handle_t *bshp) -{ - - panic("obio_bs_alloc(): not implemented"); -} - - -void -obio_bs_unmap(void *t, bus_space_handle_t h, bus_size_t size) -{ - vm_offset_t va, endva; - - if (pmap_devmap_find_va((vm_offset_t)t, size) != NULL) { - /* Device was statically mapped; nothing to do. */ - return; - } - - endva = round_page((vm_offset_t)t + size); - va = trunc_page((vm_offset_t)t); - - while (va < endva) { - pmap_kremove(va); - va += PAGE_SIZE; - } - kmem_free(kernel_map, va, endva - va); -} - -void -obio_bs_free(void *t, bus_space_handle_t bsh, bus_size_t size) -{ - - panic("obio_bs_free(): not implemented"); -} - -int -obio_bs_subregion(void *t, bus_space_handle_t bsh, bus_size_t offset, - bus_size_t size, bus_space_handle_t *nbshp) -{ - - *nbshp = bsh + offset; - return (0); -} - -void -obio_bs_barrier(void *t, bus_space_handle_t bsh, bus_size_t offset, - bus_size_t len, int flags) -{ - - /* Nothing to do. */ -} ==== //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i8134x/crb_machdep.c#3 (text+ko) ==== @@ -46,10 +46,9 @@ */ #include "opt_msgbuf.h" -#include "opt_ddb.h" #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/crb_machdep.c,v 1.4 2008/03/12 10:11:55 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/crb_machdep.c,v 1.5 2008/04/03 16:44:50 imp Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -125,11 +124,7 @@ extern u_int undefined_handler_address; struct pv_addr kernel_pt_table[NUM_KERNEL_PTS]; - -extern void *_end; - extern vm_offset_t sa1_cache_clean_addr; - extern int *end; struct pcpu __pcpu; @@ -189,73 +184,26 @@ #define SDRAM_START 0x00000000 -#ifdef DDB -extern vm_offset_t ksym_start, ksym_end; -#endif - extern vm_offset_t xscale_cache_clean_addr; void * initarm(void *arg, void *arg2) { struct pv_addr kernel_l1pt; - int loop; + int loop, i; u_int l1pagetable; vm_offset_t freemempos; vm_offset_t freemem_pt; vm_offset_t afterkern; vm_offset_t freemem_after; vm_offset_t lastaddr; -#ifdef DDB - vm_offset_t zstart = 0, zend = 0; -#endif - int i; - uint32_t fake_preload[35]; uint32_t memsize, memstart; - i = 0; - set_cpufuncs(); - fake_preload[i++] = MODINFO_NAME; - fake_preload[i++] = strlen("elf kernel") + 1; - strcpy((char*)&fake_preload[i++], "elf kernel"); - i += 2; - fake_preload[i++] = MODINFO_TYPE; - fake_preload[i++] = strlen("elf kernel") + 1; - strcpy((char*)&fake_preload[i++], "elf kernel"); - i += 2; - fake_preload[i++] = MODINFO_ADDR; - fake_preload[i++] = sizeof(vm_offset_t); - fake_preload[i++] = KERNBASE + 0x00200000; - fake_preload[i++] = MODINFO_SIZE; - fake_preload[i++] = sizeof(uint32_t); - fake_preload[i++] = (uint32_t)&end - KERNBASE - 0x00200000; -#ifdef DDB - if (*(uint32_t *)KERNVIRTADDR == MAGIC_TRAMP_NUMBER) { - fake_preload[i++] = MODINFO_METADATA|MODINFOMD_SSYM; - fake_preload[i++] = sizeof(vm_offset_t); - fake_preload[i++] = *(uint32_t *)(KERNVIRTADDR + 4); - fake_preload[i++] = MODINFO_METADATA|MODINFOMD_ESYM; - fake_preload[i++] = sizeof(vm_offset_t); - fake_preload[i++] = *(uint32_t *)(KERNVIRTADDR + 8); - lastaddr = *(uint32_t *)(KERNVIRTADDR + 8); - zend = lastaddr; - zstart = *(uint32_t *)(KERNVIRTADDR + 4); - ksym_start = zstart; - ksym_end = zend; - } else -#endif >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Apr 3 22:12:42 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 794021065671; Thu, 3 Apr 2008 22:12:42 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3B5CE106566C for ; Thu, 3 Apr 2008 22:12:42 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 25FFC8FC18 for ; Thu, 3 Apr 2008 22:12:42 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m33MCgPg039321 for ; Thu, 3 Apr 2008 22:12:42 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m33MCgRf039319 for perforce@freebsd.org; Thu, 3 Apr 2008 22:12:42 GMT (envelope-from thompsa@freebsd.org) Date: Thu, 3 Apr 2008 22:12:42 GMT Message-Id: <200804032212.m33MCgRf039319@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 139302 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Apr 2008 22:12:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=139302 Change 139302 by thompsa@thompsa_burger on 2008/04/03 22:12:02 Add raw frame tx support. Submitted via: vapified wpi(4) w/ WPA Affected files ... .. //depot/projects/vap/sys/dev/wpi/if_wpi.c#15 edit Differences ... ==== //depot/projects/vap/sys/dev/wpi/if_wpi.c#15 (text+ko) ==== @@ -197,6 +197,8 @@ static int wpi_tx_data(struct wpi_softc *, struct mbuf *, struct ieee80211_node *, int); static void wpi_start(struct ifnet *); +static int wpi_raw_xmit(struct ieee80211_node *, struct mbuf *, + const struct ieee80211_bpf_params *); static void wpi_scan_start(struct ieee80211com *); static void wpi_scan_end(struct ieee80211com *); static void wpi_set_channel(struct ieee80211com *); @@ -666,6 +668,7 @@ /* override default methods */ ic->ic_node_alloc = wpi_node_alloc; ic->ic_newassoc = wpi_newassoc; + ic->ic_raw_xmit = wpi_raw_xmit; ic->ic_wme.wme_update = wpi_wme_update; ic->ic_scan_start = wpi_scan_start; ic->ic_scan_end = wpi_scan_end; @@ -2026,6 +2029,46 @@ } static int +wpi_raw_xmit(struct ieee80211_node *ni, struct mbuf *m, + const struct ieee80211_bpf_params *params) +{ + struct ieee80211com *ic = ni->ni_ic; + struct ifnet *ifp = ic->ic_ifp; + struct wpi_softc *sc = ifp->if_softc; + + /* prevent management frames from being sent if we're not ready */ + if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) { + m_freem(m); + ieee80211_free_node(ni); + return ENETDOWN; + } + WPI_LOCK(sc); + + /* management frames go into ring 0 */ + if (sc->txq[0].queued > sc->txq[0].count - 8) { + ifp->if_drv_flags |= IFF_DRV_OACTIVE; + m_freem(m); + WPI_UNLOCK(sc); + ieee80211_free_node(ni); + return ENOBUFS; /* XXX */ + } + + ifp->if_opackets++; + if (wpi_tx_data(sc, m, ni, 0) != 0) + goto bad; + sc->sc_tx_timer = 5; + callout_reset(&sc->watchdog_to, hz, wpi_watchdog, sc); + + WPI_UNLOCK(sc); + return 0; +bad: + ifp->if_oerrors++; + WPI_UNLOCK(sc); + ieee80211_free_node(ni); + return EIO; /* XXX */ +} + +static int wpi_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) { struct wpi_softc *sc = ifp->if_softc; From owner-p4-projects@FreeBSD.ORG Thu Apr 3 22:19:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1589A10656B3; Thu, 3 Apr 2008 22:19:50 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CB041106566B for ; Thu, 3 Apr 2008 22:19:49 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B5A358FC19 for ; Thu, 3 Apr 2008 22:19:49 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m33MJno6041518 for ; Thu, 3 Apr 2008 22:19:49 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m33MJnMS041513 for perforce@freebsd.org; Thu, 3 Apr 2008 22:19:49 GMT (envelope-from thompsa@freebsd.org) Date: Thu, 3 Apr 2008 22:19:49 GMT Message-Id: <200804032219.m33MJnMS041513@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 139303 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Apr 2008 22:19:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=139303 Change 139303 by thompsa@thompsa_burger on 2008/04/03 22:19:26 wpi_start doesnt recurse anymore. Affected files ... .. //depot/projects/vap/sys/dev/wpi/if_wpi.c#16 edit .. //depot/projects/vap/sys/dev/wpi/if_wpivar.h#6 edit Differences ... ==== //depot/projects/vap/sys/dev/wpi/if_wpi.c#16 (text+ko) ==== @@ -197,6 +197,7 @@ static int wpi_tx_data(struct wpi_softc *, struct mbuf *, struct ieee80211_node *, int); static void wpi_start(struct ifnet *); +static void wpi_start_locked(struct ifnet *); static int wpi_raw_xmit(struct ieee80211_node *, struct mbuf *, const struct ieee80211_bpf_params *); static void wpi_scan_start(struct ieee80211com *); @@ -1585,7 +1586,7 @@ sc->sc_tx_timer = 0; ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; - wpi_start(ifp); + wpi_start_locked(ifp); } static void @@ -1985,17 +1986,25 @@ wpi_start(struct ifnet *ifp) { struct wpi_softc *sc = ifp->if_softc; + + WPI_LOCK(sc); + wpi_start_locked(ifp); + WPI_UNLOCK(sc); +} + +static void +wpi_start_locked(struct ifnet *ifp) +{ + struct wpi_softc *sc = ifp->if_softc; struct ieee80211_node *ni; struct mbuf *m; - int ac, waslocked; + int ac; + + WPI_LOCK_ASSERT(sc); if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) return; - waslocked = WPI_LOCK_OWNED(sc); - if (!waslocked) - WPI_LOCK(sc); - for (;;) { IFQ_POLL(&ifp->if_snd, m); if (m == NULL) @@ -2023,9 +2032,6 @@ } sc->sc_tx_timer = 5; } - - if (!waslocked) - WPI_UNLOCK(sc); } static int ==== //depot/projects/vap/sys/dev/wpi/if_wpivar.h#6 (text+ko) ==== @@ -238,7 +238,6 @@ #define WPI_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx) #define WPI_UNLOCK(_sc) mtx_unlock(&(_sc)->sc_mtx) #define WPI_LOCK_ASSERT(sc) mtx_assert(&(sc)->sc_mtx, MA_OWNED) -#define WPI_LOCK_OWNED(_sc) mtx_owned(&(_sc)->sc_mtx) #define WPI_LOCK_DESTROY(_sc) mtx_destroy(&(_sc)->sc_mtx) #define WPI_CMD_LOCK_INIT(_sc) \ From owner-p4-projects@FreeBSD.ORG Thu Apr 3 23:00:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 56E651065671; Thu, 3 Apr 2008 23:00:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 192FC106566C for ; Thu, 3 Apr 2008 23:00:38 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F30EE8FC1A for ; Thu, 3 Apr 2008 23:00:37 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m33N0bVd045317 for ; Thu, 3 Apr 2008 23:00:37 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m33N0bts045315 for perforce@freebsd.org; Thu, 3 Apr 2008 23:00:37 GMT (envelope-from sam@freebsd.org) Date: Thu, 3 Apr 2008 23:00:37 GMT Message-Id: <200804032300.m33N0bts045315@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 139306 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Apr 2008 23:00:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=139306 Change 139306 by sam@sam_ebb on 2008/04/03 23:00:21 IFC @ 139304 Affected files ... .. //depot/projects/vap/lib/libc/gen/err.c#3 integrate .. //depot/projects/vap/sbin/restore/dirs.c#3 integrate .. //depot/projects/vap/sbin/restore/interactive.c#3 integrate Differences ... ==== //depot/projects/vap/lib/libc/gen/err.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ static char sccsid[] = "@(#)err.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/err.c,v 1.14 2007/01/09 00:27:53 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/err.c,v 1.15 2008/04/03 20:36:44 imp Exp $"); #include "namespace.h" #include @@ -97,11 +97,7 @@ } void -verrc(eval, code, fmt, ap) - int eval; - int code; - const char *fmt; - va_list ap; +verrc(int eval, int code, const char *fmt, va_list ap) { if (err_file == 0) err_set_file((FILE *)0); @@ -126,10 +122,7 @@ } void -verrx(eval, fmt, ap) - int eval; - const char *fmt; - va_list ap; +verrx(int eval, const char *fmt, va_list ap) { if (err_file == 0) err_set_file((FILE *)0); @@ -154,9 +147,7 @@ } void -vwarn(fmt, ap) - const char *fmt; - va_list ap; +vwarn(const char *fmt, va_list ap) { vwarnc(errno, fmt, ap); } @@ -171,10 +162,7 @@ } void -vwarnc(code, fmt, ap) - int code; - const char *fmt; - va_list ap; +vwarnc(int code, const char *fmt, va_list ap) { if (err_file == 0) err_set_file((FILE *)0); @@ -196,9 +184,7 @@ } void -vwarnx(fmt, ap) - const char *fmt; - va_list ap; +vwarnx(const char *fmt, va_list ap) { if (err_file == 0) err_set_file((FILE *)0); ==== //depot/projects/vap/sbin/restore/dirs.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ static char sccsid[] = "@(#)dirs.c 8.7 (Berkeley) 5/1/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/restore/dirs.c,v 1.31 2007/02/26 08:15:56 mckusick Exp $"; + "$FreeBSD: src/sbin/restore/dirs.c,v 1.32 2008/04/03 20:37:38 imp Exp $"; #endif /* not lint */ #include @@ -216,7 +216,7 @@ struct direct *dp; int namelen; long bpt; - char locname[MAXPATHLEN + 1]; + char locname[MAXPATHLEN]; itp = inotablookup(ino); if (itp == NULL) { @@ -235,9 +235,8 @@ * begin search through the directory * skipping over "." and ".." */ - (void) strncpy(locname, pname, sizeof(locname) - 1); - locname[sizeof(locname) - 1] = '\0'; - (void) strncat(locname, "/", sizeof(locname) - strlen(locname)); + (void) strlcpy(locname, pname, sizeof(locname)); + (void) strlcat(locname, "/", sizeof(locname)); namelen = strlen(locname); rst_seekdir(dirp, itp->t_seekpt, itp->t_seekpt); dp = rst_readdir(dirp); /* "." */ @@ -261,7 +260,7 @@ fprintf(stderr, "%s%s: name exceeds %d char\n", locname, dp->d_name, sizeof(locname) - 1); } else { - (void) strncat(locname, dp->d_name, (int)dp->d_namlen); + (void)strlcat(locname, dp->d_name, sizeof(locname)); treescan(locname, dp->d_ino, todo); rst_seekdir(dirp, bpt, itp->t_seekpt); } ==== //depot/projects/vap/sbin/restore/interactive.c#3 (text+ko) ==== @@ -34,7 +34,7 @@ #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/sbin/restore/interactive.c,v 1.18 2005/07/21 16:12:35 dds Exp $"); +__FBSDID("$FreeBSD: src/sbin/restore/interactive.c,v 1.19 2008/04/03 20:37:38 imp Exp $"); #include #include @@ -502,7 +502,7 @@ struct afile single; RST_DIR *dirp; int entries, len, namelen; - char locname[MAXPATHLEN + 1]; + char locname[MAXPATHLEN]; dp = pathsearch(name); if (dp == NULL || (!dflag && TSTINO(dp->d_ino, dumpmap) == 0) || @@ -533,8 +533,8 @@ fprintf(stderr, "%s:\n", name); entries = 0; listp = list; - (void) strncpy(locname, name, MAXPATHLEN); - (void) strncat(locname, "/", MAXPATHLEN); + (void)strlcpy(locname, name, MAXPATHLEN); + (void)strlcat(locname, "/", MAXPATHLEN); namelen = strlen(locname); while ((dp = rst_readdir(dirp))) { if (dp == NULL) @@ -545,13 +545,11 @@ strcmp(dp->d_name, ".") == 0 || strcmp(dp->d_name, "..") == 0)) continue; - locname[namelen] = '\0'; if (namelen + dp->d_namlen >= MAXPATHLEN) { fprintf(stderr, "%s%s: name exceeds %d char\n", locname, dp->d_name, MAXPATHLEN); } else { - (void) strncat(locname, dp->d_name, - (int)dp->d_namlen); + (void)strlcat(locname, dp->d_name, MAXPATHLEN); mkentry(locname, dp, listp++); entries++; } From owner-p4-projects@FreeBSD.ORG Fri Apr 4 04:04:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D71681065674; Fri, 4 Apr 2008 04:04:59 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 97984106566B for ; Fri, 4 Apr 2008 04:04:59 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7E94B8FC12 for ; Fri, 4 Apr 2008 04:04:59 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3444x6w084369 for ; Fri, 4 Apr 2008 04:04:59 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3444x0c084367 for perforce@freebsd.org; Fri, 4 Apr 2008 04:04:59 GMT (envelope-from marcel@freebsd.org) Date: Fri, 4 Apr 2008 04:04:59 GMT Message-Id: <200804040404.m3444x0c084367@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 139321 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Apr 2008 04:05:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=139321 Change 139321 by marcel@marcel_xcllnt on 2008/04/04 04:04:29 We need NFSLOCKD now. Strip GPart schemes that I don't need here. Affected files ... .. //depot/projects/powerpc/sys/powerpc/conf/XSERVE#7 edit Differences ... ==== //depot/projects/powerpc/sys/powerpc/conf/XSERVE#7 (text+ko) ==== @@ -9,8 +9,6 @@ options DDB options FFS options GDB -options GEOM_PART_BSD -options GEOM_PART_GPT options INET options INET6 #options INTR_FILTER @@ -20,6 +18,7 @@ options KTRACE options MSDOSFS options NFSCLIENT +options NFSLOCKD options P1003_1B_SEMAPHORES options POWERMAC options PROCFS From owner-p4-projects@FreeBSD.ORG Fri Apr 4 07:09:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BE7DF1065673; Fri, 4 Apr 2008 07:09:15 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 67515106566C for ; Fri, 4 Apr 2008 07:09:15 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 534F38FC2B for ; Fri, 4 Apr 2008 07:09:15 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3479F9Q003962 for ; Fri, 4 Apr 2008 07:09:15 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3479E2i003960 for perforce@freebsd.org; Fri, 4 Apr 2008 07:09:14 GMT (envelope-from imp@freebsd.org) Date: Fri, 4 Apr 2008 07:09:14 GMT Message-Id: <200804040709.m3479E2i003960@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 139325 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Apr 2008 07:09:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=139325 Change 139325 by imp@imp_paco-paco on 2008/04/04 07:08:57 IFC @139323 Affected files ... .. //depot/projects/arm/src/bin/ls/ls.1#4 integrate .. //depot/projects/arm/src/bin/ls/ls.c#2 integrate .. //depot/projects/arm/src/bin/ls/ls.h#2 integrate .. //depot/projects/arm/src/bin/ls/print.c#3 integrate .. //depot/projects/arm/src/bin/ls/util.c#2 integrate .. //depot/projects/arm/src/etc/rc.d/zfs#5 integrate .. //depot/projects/arm/src/games/fortune/datfiles/fortunes#19 integrate .. //depot/projects/arm/src/lib/libc/gen/err.c#3 integrate .. //depot/projects/arm/src/lib/libc/gen/msgctl.3#3 integrate .. //depot/projects/arm/src/lib/libc/include/namespace.h#4 integrate .. //depot/projects/arm/src/lib/libc/include/un-namespace.h#4 integrate .. //depot/projects/arm/src/lib/libc/sys/aio_cancel.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/aio_suspend.2#2 integrate .. //depot/projects/arm/src/lib/libthr/arch/amd64/Makefile.inc#3 integrate .. //depot/projects/arm/src/lib/libthr/arch/amd64/amd64/_umtx_op_err.S#1 branch .. //depot/projects/arm/src/lib/libthr/arch/amd64/include/pthread_md.h#3 integrate .. //depot/projects/arm/src/lib/libthr/arch/i386/Makefile.inc#3 integrate .. //depot/projects/arm/src/lib/libthr/arch/i386/i386/_umtx_op_err.S#1 branch .. //depot/projects/arm/src/lib/libthr/arch/i386/include/pthread_md.h#3 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_affinity.c#3 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_cond.c#6 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_private.h#13 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_rtld.c#5 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_umtx.c#10 integrate .. //depot/projects/arm/src/lib/msun/src/s_fma.c#2 integrate .. //depot/projects/arm/src/lib/msun/src/s_fmal.c#3 integrate .. //depot/projects/arm/src/sbin/fsck_ffs/main.c#6 integrate .. //depot/projects/arm/src/sbin/restore/dirs.c#3 integrate .. //depot/projects/arm/src/sbin/restore/interactive.c#2 integrate .. //depot/projects/arm/src/share/mk/sys.mk#7 integrate .. //depot/projects/arm/src/sys/arm/arm/bus_space_generic.c#1 branch .. //depot/projects/arm/src/sys/arm/arm/machdep.c#11 integrate .. //depot/projects/arm/src/sys/arm/at91/kb920x_machdep.c#47 integrate .. //depot/projects/arm/src/sys/arm/include/machdep.h#3 integrate .. //depot/projects/arm/src/sys/arm/sa11x0/assabet_machdep.c#11 integrate .. //depot/projects/arm/src/sys/arm/sa11x0/files.sa11x0#3 integrate .. //depot/projects/arm/src/sys/arm/sa11x0/sa11x0_io.c#7 integrate .. //depot/projects/arm/src/sys/arm/xscale/i80321/ep80219_machdep.c#8 integrate .. //depot/projects/arm/src/sys/arm/xscale/i80321/files.ep80219#2 integrate .. //depot/projects/arm/src/sys/arm/xscale/i80321/files.i80219#2 integrate .. //depot/projects/arm/src/sys/arm/xscale/i80321/files.i80321#3 integrate .. //depot/projects/arm/src/sys/arm/xscale/i80321/files.iq31244#2 integrate .. //depot/projects/arm/src/sys/arm/xscale/i80321/iq31244_machdep.c#18 integrate .. //depot/projects/arm/src/sys/arm/xscale/i80321/obio_space.c#4 integrate .. //depot/projects/arm/src/sys/arm/xscale/i8134x/crb_machdep.c#4 integrate .. //depot/projects/arm/src/sys/arm/xscale/i8134x/obio_space.c#3 integrate .. //depot/projects/arm/src/sys/arm/xscale/ixp425/avila_machdep.c#15 integrate .. //depot/projects/arm/src/sys/arm/xscale/ixp425/files.avila#9 integrate .. //depot/projects/arm/src/sys/arm/xscale/ixp425/files.ixp425#12 integrate .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_a4x_space.c#5 integrate .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_space.c#6 integrate .. //depot/projects/arm/src/sys/conf/Makefile.arm#21 integrate .. //depot/projects/arm/src/sys/conf/NOTES#62 integrate .. //depot/projects/arm/src/sys/conf/files#88 integrate .. //depot/projects/arm/src/sys/dev/aac/aac_disk.c#4 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_80003es2lan.c#5 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_82540.c#5 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_82541.c#5 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_82542.c#5 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_82543.c#5 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_82571.c#5 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_82571.h#5 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_api.c#5 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_api.h#5 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_defines.h#5 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_hw.h#5 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_ich8lan.c#5 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_ich8lan.h#5 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_mac.c#5 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_mac.h#5 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_manage.c#5 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_nvm.c#5 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_nvm.h#5 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_osdep.c#1 branch .. //depot/projects/arm/src/sys/dev/em/e1000_osdep.h#5 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_phy.c#5 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_phy.h#5 integrate .. //depot/projects/arm/src/sys/dev/em/if_em.c#45 integrate .. //depot/projects/arm/src/sys/dev/em/if_em.h#20 integrate .. //depot/projects/arm/src/sys/dev/igb/e1000_mac.c#2 integrate .. //depot/projects/arm/src/sys/dev/igb/e1000_osdep.c#1 branch .. //depot/projects/arm/src/sys/dev/igb/if_igb.c#2 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt.c#29 integrate .. //depot/projects/arm/src/sys/dev/mxge/if_mxge.c#23 integrate .. //depot/projects/arm/src/sys/kern/kern_clock.c#19 integrate .. //depot/projects/arm/src/sys/kern/kern_conf.c#15 integrate .. //depot/projects/arm/src/sys/kern/kern_cpuset.c#5 integrate .. //depot/projects/arm/src/sys/kern/kern_event.c#17 integrate .. //depot/projects/arm/src/sys/kern/kern_intr.c#19 integrate .. //depot/projects/arm/src/sys/kern/kern_timeout.c#11 integrate .. //depot/projects/arm/src/sys/kern/kern_umtx.c#21 integrate .. //depot/projects/arm/src/sys/kern/sched_ule.c#33 integrate .. //depot/projects/arm/src/sys/kern/subr_sleepqueue.c#21 integrate .. //depot/projects/arm/src/sys/kern/vfs_subr.c#45 integrate .. //depot/projects/arm/src/sys/modules/em/Makefile#7 integrate .. //depot/projects/arm/src/sys/modules/igb/Makefile#3 integrate .. //depot/projects/arm/src/sys/powerpc/include/asm.h#2 integrate .. //depot/projects/arm/src/sys/powerpc/psim/openpic_iobus.c#5 integrate .. //depot/projects/arm/src/sys/sys/callout.h#6 integrate .. //depot/projects/arm/src/sys/sys/cpuset.h#5 integrate .. //depot/projects/arm/src/tools/regression/lib/msun/Makefile#4 integrate .. //depot/projects/arm/src/tools/regression/lib/msun/test-fma.c#1 branch .. //depot/projects/arm/src/tools/regression/lib/msun/test-fma.t#1 branch .. //depot/projects/arm/src/tools/tools/mctest/Makefile#1 branch .. //depot/projects/arm/src/tools/tools/mctest/mctest.1#1 branch .. //depot/projects/arm/src/tools/tools/mctest/mctest.cc#2 integrate .. //depot/projects/arm/src/tools/tools/mctest/mctest.h#2 integrate .. //depot/projects/arm/src/usr.bin/kdump/kdump.1#3 integrate .. //depot/projects/arm/src/usr.bin/kdump/kdump.c#8 integrate .. //depot/projects/arm/src/usr.bin/ktrace/ktrace.1#4 integrate .. //depot/projects/arm/src/usr.bin/ktrace/ktrace.c#4 integrate Differences ... ==== //depot/projects/arm/src/bin/ls/ls.1#4 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.100 2006/10/12 10:08:52 ru Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.102 2008/04/04 05:55:42 ru Exp $ .\" -.Dd October 12, 2006 +.Dd April 4, 2008 .Dt LS 1 .Os .Sh NAME @@ -41,6 +41,7 @@ .Sh SYNOPSIS .Nm .Op Fl ABCFGHILPRSTUWZabcdfghiklmnopqrstuwx1 +.Op Fl D Ar format .Op Ar .Sh DESCRIPTION For each operand that names a @@ -88,6 +89,21 @@ is the numeric value of the character in octal. .It Fl C Force multi-column output; this is the default when output is to a terminal. +.It Fl D Ar format +When printing in the long +.Pq Fl l +format, use +.Ar format +to format the date and time output. +The argument +.Ar format +is a string used by +.Xr strftime 3 . +Depending on the choice of format string, this may result in a +different number of columns in the output. +This option overrides the +.Fl T +option. .It Fl F Display a slash .Pq Ql / @@ -146,12 +162,13 @@ Sort by size (largest file first) before sorting the operands in lexicographical order. .It Fl T -When used with the -.Fl l -(lowercase letter -.Dq ell ) -option, display complete time information for the file, including +When printing in the long +.Pq Fl l +format, display complete time information for the file, including month, day, hour, minute, second, and year. +The +.Fl D +option gives even more control over the output format. .It Fl U Use time when file was created for sorting or printing. .It Fl W @@ -325,7 +342,12 @@ modified, and the pathname. .Pp If the modification time of the file is more than 6 months -in the past or future, then the year of the last modification +in the past or future, and the +.Fl D +or +.Fl T +are not specified, +then the year of the last modification is displayed in place of the hour and minute fields. .Pp If the owner or group names are not a known user or group name, @@ -657,6 +679,7 @@ .Xr getfacl 1 , .Xr sort 1 , .Xr xterm 1 , +.Xr strftime 3 , .Xr termcap 5 , .Xr maclabel 7 , .Xr symlink 7 , ==== //depot/projects/arm/src/bin/ls/ls.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.85 2006/03/24 17:09:03 jhb Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.86 2008/04/04 03:57:46 grog Exp $"); #include #include @@ -125,10 +125,11 @@ static int f_singlecol; /* use single column output */ int f_size; /* list size in short listing */ int f_slash; /* similar to f_type, but only for dirs */ - int f_sortacross; /* sort across rows, not down columns */ + int f_sortacross; /* sort across rows, not down columns */ int f_statustime; /* use time of last mode change */ static int f_stream; /* stream the output, separate with commas */ static int f_timesort; /* sort by time vice name */ + char *f_timeformat; /* user-specified time format */ static int f_sizesort; int f_type; /* add type character for non-regular files */ static int f_whiteout; /* show whiteout entries */ @@ -179,7 +180,7 @@ fts_options = FTS_PHYSICAL; while ((ch = getopt(argc, argv, - "1ABCFGHILPRSTUWZabcdfghiklmnopqrstuwx")) != -1) { + "1ABCD:FGHILPRSTUWZabcdfghiklmnopqrstuwx")) != -1) { switch (ch) { /* * The -1, -C, -x and -l options all override each other so @@ -198,6 +199,9 @@ case 'C': f_sortacross = f_longform = f_singlecol = 0; break; + case 'D': + f_timeformat = optarg; + break; case 'l': f_longform = 1; f_singlecol = 0; ==== //depot/projects/arm/src/bin/ls/ls.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * from: @(#)ls.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD: src/bin/ls/ls.h,v 1.22 2006/03/24 16:38:02 jhb Exp $ + * $FreeBSD: src/bin/ls/ls.h,v 1.23 2008/04/04 03:57:46 grog Exp $ */ #define NO_PRINT 1 @@ -50,8 +50,9 @@ extern int f_sectime; /* print the real time for all files */ extern int f_size; /* list size in short listing */ extern int f_slash; /* append a '/' if the file is a directory */ -extern int f_sortacross; /* sort across rows, not down columns */ +extern int f_sortacross; /* sort across rows, not down columns */ extern int f_statustime; /* use time of last mode change */ +extern char *f_timeformat; /* user-specified time format */ extern int f_notabs; /* don't use tab-separated multi-col output */ extern int f_type; /* add type character for non-regular files */ #ifdef COLORLS ==== //depot/projects/arm/src/bin/ls/print.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.76 2006/10/18 10:58:27 ru Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.77 2008/04/04 03:57:46 grog Exp $"); #include #include @@ -168,7 +168,7 @@ prevdev = sp->st_dev; } np = p->fts_pointer; - (void)printf("%s %*u %-*s %-*s ", buf, dp->s_nlink, + (void)printf("%s %*u %-*s %-*s ", buf, dp->s_nlink, sp->st_nlink, dp->s_user, np->user, dp->s_group, np->group); if (f_flags) @@ -237,7 +237,7 @@ if (chcnt) putchar('\n'); } - + void printcol(const DISPLAY *dp) { @@ -378,17 +378,20 @@ now = time(NULL); #define SIXMONTHS ((365 / 2) * 86400) - if (f_sectime) + if (f_timeformat) /* user specified format */ + format = f_timeformat; + else if (f_sectime) /* mmm dd hh:mm:ss yyyy || dd mmm hh:mm:ss yyyy */ - format = d_first ? "%e %b %T %Y " : "%b %e %T %Y "; + format = d_first ? "%e %b %T %Y" : "%b %e %T %Y"; else if (ftime + SIXMONTHS > now && ftime < now + SIXMONTHS) /* mmm dd hh:mm || dd mmm hh:mm */ - format = d_first ? "%e %b %R " : "%b %e %R "; + format = d_first ? "%e %b %R" : "%b %e %R"; else /* mmm dd yyyy || dd mmm yyyy */ - format = d_first ? "%e %b %Y " : "%b %e %Y "; + format = d_first ? "%e %b %Y" : "%b %e %Y"; strftime(longstring, sizeof(longstring), format, localtime(&ftime)); fputs(longstring, stdout); + fputc(' ', stdout); } static int @@ -625,7 +628,7 @@ snprintf(name, sizeof(name), "%s", p->fts_name); else snprintf(name, sizeof(name), "%s/%s", - p->fts_parent->fts_accpath, p->fts_name); + p->fts_parent->fts_accpath, p->fts_name); /* * We have no way to tell whether a symbolic link has an ACL since * pathconf() and acl_get_file() both follow them. They also don't ==== //depot/projects/arm/src/bin/ls/util.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/util.c,v 1.40 2006/03/24 16:38:02 jhb Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/util.c,v 1.41 2008/04/04 05:55:42 ru Exp $"); #include #include @@ -222,9 +222,9 @@ { (void)fprintf(stderr, #ifdef COLORLS - "usage: ls [-ABCFGHILPRSTUWZabcdfghiklmnopqrstuwx1]" + "usage: ls [-ABCFGHILPRSTUWZabcdfghiklmnopqrstuwx1] [-D format]" #else - "usage: ls [-ABCFHILPRSTUWZabcdfghiklmnopqrstuwx1]" + "usage: ls [-ABCFHILPRSTUWZabcdfghiklmnopqrstuwx1] [-D format]" #endif " [file ...]\n"); exit(1); ==== //depot/projects/arm/src/etc/rc.d/zfs#5 (text+ko) ==== @@ -1,11 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/zfs,v 1.6 2008/03/19 14:44:55 pjd Exp $ +# $FreeBSD: src/etc/rc.d/zfs,v 1.7 2008/04/02 19:29:16 dougb Exp $ # # PROVIDE: zfs # REQUIRE: mountcritlocal -# BEFORE: mountcritremote . /etc/rc.subr ==== //depot/projects/arm/src/games/fortune/datfiles/fortunes#19 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.259 2008/03/31 10:28:09 ganbold Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.260 2008/04/03 10:22:56 yar Exp $ % ======================================================================= || || @@ -46075,6 +46075,12 @@ The greatest griefs are those we cause ourselves. -- Sophocles % +The greatest joy a man can know is to conquer his enemies and drive them +before him. To ride their horses and take away their possessions. To see +the faces of those who were dear to them bedewed with tears, and to clasp +their wives and daughters to his arms. + -- Chinggis (Genghis) Khan +% The greatest love is a mother's, then a dog's, then a sweetheart's. -- Polish proverb % ==== //depot/projects/arm/src/lib/libc/gen/err.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ static char sccsid[] = "@(#)err.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/err.c,v 1.14 2007/01/09 00:27:53 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/err.c,v 1.15 2008/04/03 20:36:44 imp Exp $"); #include "namespace.h" #include @@ -97,11 +97,7 @@ } void -verrc(eval, code, fmt, ap) - int eval; - int code; - const char *fmt; - va_list ap; +verrc(int eval, int code, const char *fmt, va_list ap) { if (err_file == 0) err_set_file((FILE *)0); @@ -126,10 +122,7 @@ } void -verrx(eval, fmt, ap) - int eval; - const char *fmt; - va_list ap; +verrx(int eval, const char *fmt, va_list ap) { if (err_file == 0) err_set_file((FILE *)0); @@ -154,9 +147,7 @@ } void -vwarn(fmt, ap) - const char *fmt; - va_list ap; +vwarn(const char *fmt, va_list ap) { vwarnc(errno, fmt, ap); } @@ -171,10 +162,7 @@ } void -vwarnc(code, fmt, ap) - int code; - const char *fmt; - va_list ap; +vwarnc(int code, const char *fmt, va_list ap) { if (err_file == 0) err_set_file((FILE *)0); @@ -196,9 +184,7 @@ } void -vwarnx(fmt, ap) - const char *fmt; - va_list ap; +vwarnx(const char *fmt, va_list ap) { if (err_file == 0) err_set_file((FILE *)0); ==== //depot/projects/arm/src/lib/libc/gen/msgctl.3#3 (text+ko) ==== @@ -29,9 +29,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/msgctl.3,v 1.20 2006/08/09 18:05:44 maxim Exp $ +.\" $FreeBSD: src/lib/libc/gen/msgctl.3,v 1.21 2008/04/03 16:21:43 ru Exp $ .\"/ -.Dd November 24, 1997 +.Dd April 3, 2008 .Dt MSGCTL 3 .Os .Sh NAME @@ -65,9 +65,9 @@ struct ipc_perm msg_perm; /* msg queue permission bits */ struct msg *msg_first; /* first message in the queue */ struct msg *msg_last; /* last message in the queue */ - u_long msg_cbytes; /* number of bytes in use on the queue */ - u_long msg_qnum; /* number of msgs in the queue */ - u_long msg_qbytes; /* max # of bytes on the queue */ + msglen_t msg_cbytes; /* number of bytes in use on the queue */ + msgqnum_t msg_qnum; /* number of msgs in the queue */ + msglen_t msg_qbytes; /* max # of bytes on the queue */ pid_t msg_lspid; /* pid of last msgsnd() */ pid_t msg_lrpid; /* pid of last msgrcv() */ time_t msg_stime; /* time of last msgsnd() */ @@ -89,13 +89,13 @@ and looks like this: .Bd -literal struct ipc_perm { - ushort cuid; /* creator user id */ - ushort cgid; /* creator group id */ - ushort uid; /* user id */ - ushort gid; /* group id */ - ushort mode; /* r/w permission */ - ushort seq; /* sequence # (to generate unique msg/sem/shm id) */ - key_t key; /* user specified msg/sem/shm key */ + unsigned short cuid; /* creator user id */ + unsigned short cgid; /* creator group id */ + unsigned short uid; /* user id */ + unsigned short gid; /* group id */ + unsigned short mode; /* r/w permission */ + unsigned short seq; /* sequence # (to generate unique ipcid) */ + key_t key; /* user specified msg/sem/shm key */ }; .Ed .Pp ==== //depot/projects/arm/src/lib/libc/include/namespace.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/include/namespace.h,v 1.22 2008/03/25 15:33:00 ru Exp $ + * $FreeBSD: src/lib/libc/include/namespace.h,v 1.23 2008/04/02 08:53:18 davidxu Exp $ */ #ifndef _NAMESPACE_H_ @@ -132,6 +132,7 @@ #define pthread_detach _pthread_detach #define pthread_equal _pthread_equal #define pthread_exit _pthread_exit +#define pthread_getaffinity_np _pthread_getaffinity_np #define pthread_getconcurrency _pthread_getconcurrency #define pthread_getcpuclockid _pthread_getcpuclockid #define pthread_getprio _pthread_getprio @@ -182,6 +183,7 @@ #define pthread_rwlockattr_setpshared _pthread_rwlockattr_setpshared #define pthread_self _pthread_self #define pthread_set_name_np _pthread_set_name_np +#define pthread_setaffinity_np _pthread_setaffinity_np #define pthread_setcancelstate _pthread_setcancelstate #define pthread_setcanceltype _pthread_setcanceltype #define pthread_setconcurrency _pthread_setconcurrency ==== //depot/projects/arm/src/lib/libc/include/un-namespace.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/include/un-namespace.h,v 1.19 2008/03/25 13:28:12 ru Exp $ + * $FreeBSD: src/lib/libc/include/un-namespace.h,v 1.20 2008/04/02 08:53:18 davidxu Exp $ */ #ifndef _UN_NAMESPACE_H_ @@ -113,6 +113,7 @@ #undef pthread_detach #undef pthread_equal #undef pthread_exit +#undef pthread_getaffinity_np #undef pthread_getconcurrency #undef pthread_getcpuclockid #undef pthread_getprio @@ -163,6 +164,7 @@ #undef pthread_rwlockattr_setpshared #undef pthread_self #undef pthread_set_name_np +#undef pthread_setaffinity_np #undef pthread_setcancelstate #undef pthread_setcanceltype #undef pthread_setconcurrency ==== //depot/projects/arm/src/lib/libc/sys/aio_cancel.2#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/aio_cancel.2,v 1.22 2003/01/13 10:37:11 tjr Exp $ +.\" $FreeBSD: src/lib/libc/sys/aio_cancel.2,v 1.23 2008/04/03 02:41:54 kevlo Exp $ .\" .Dd January 19, 2000 .Dt AIO_CANCEL 2 @@ -35,7 +35,7 @@ .Sh SYNOPSIS .In aio.h .Ft int -.Fn aio_cancel "int fildes" "struct aiocb * iocb" +.Fn aio_cancel "int fildes" "struct aiocb *iocb" .Sh DESCRIPTION The .Fn aio_cancel ==== //depot/projects/arm/src/lib/libc/sys/aio_suspend.2#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/aio_suspend.2,v 1.22 2004/12/23 23:45:25 keramida Exp $ +.\" $FreeBSD: src/lib/libc/sys/aio_suspend.2,v 1.23 2008/04/03 02:41:54 kevlo Exp $ .\" .Dd June 2, 1999 .Dt AIO_SUSPEND 2 @@ -35,7 +35,7 @@ .Sh SYNOPSIS .In aio.h .Ft int -.Fn aio_suspend "const struct aiocb * const iocbs[]" "int niocb" "const struct timespec * timeout" +.Fn aio_suspend "const struct aiocb *const iocbs[]" "int niocb" "const struct timespec *timeout" .Sh DESCRIPTION The .Fn aio_suspend ==== //depot/projects/arm/src/lib/libthr/arch/amd64/Makefile.inc#3 (text+ko) ==== @@ -1,5 +1,5 @@ -#$FreeBSD: src/lib/libthr/arch/amd64/Makefile.inc,v 1.3 2008/02/13 05:25:42 obrien Exp $ +#$FreeBSD: src/lib/libthr/arch/amd64/Makefile.inc,v 1.4 2008/04/02 07:41:23 davidxu Exp $ .PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH} -SRCS+= pthread_md.c +SRCS+= pthread_md.c _umtx_op_err.S ==== //depot/projects/arm/src/lib/libthr/arch/amd64/include/pthread_md.h#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/lib/libthr/arch/amd64/include/pthread_md.h,v 1.4 2006/12/15 11:52:00 davidxu Exp $ + * $FreeBSD: src/lib/libthr/arch/amd64/include/pthread_md.h,v 1.5 2008/04/02 07:41:24 davidxu Exp $ */ /* @@ -97,4 +97,7 @@ { return (TCB_GET64(tcb_thread)); } + +#define HAS__UMTX_OP_ERR 1 + #endif ==== //depot/projects/arm/src/lib/libthr/arch/i386/Makefile.inc#3 (text+ko) ==== @@ -1,5 +1,5 @@ -# $FreeBSD: src/lib/libthr/arch/i386/Makefile.inc,v 1.3 2008/02/13 05:25:43 obrien Exp $ +# $FreeBSD: src/lib/libthr/arch/i386/Makefile.inc,v 1.4 2008/04/02 07:41:24 davidxu Exp $ .PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH} -SRCS+= pthread_md.c +SRCS+= pthread_md.c _umtx_op_err.S ==== //depot/projects/arm/src/lib/libthr/arch/i386/include/pthread_md.h#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/lib/libthr/arch/i386/include/pthread_md.h,v 1.8 2006/12/15 11:52:00 davidxu Exp $ + * $FreeBSD: src/lib/libthr/arch/i386/include/pthread_md.h,v 1.9 2008/04/02 07:41:24 davidxu Exp $ */ /* @@ -102,4 +102,7 @@ { return (TCB_GET32(tcb_thread)); } + +#define HAS__UMTX_OP_ERR 1 + #endif ==== //depot/projects/arm/src/lib/libthr/thread/thr_affinity.c#3 (text+ko) ==== @@ -23,12 +23,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. * - * $FreeBSD: src/lib/libthr/thread/thr_affinity.c,v 1.2 2008/03/19 06:38:21 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_affinity.c,v 1.3 2008/04/02 11:41:12 davidxu Exp $ * */ #include "namespace.h" -#include +#include #include #include #include "un-namespace.h" ==== //depot/projects/arm/src/lib/libthr/thread/thr_cond.c#6 (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/libthr/thread/thr_cond.c,v 1.24 2008/03/31 02:55:49 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_cond.c,v 1.25 2008/04/02 08:33:42 davidxu Exp $ */ #include "namespace.h" @@ -290,56 +290,3 @@ return (cond_signal_common(cond, 1)); } - -int -_pthread_cond_wait_unlocked(pthread_cond_t *cond, pthread_mutex_t *mutex, - const struct timespec *abstime) -{ - struct pthread *curthread = _get_curthread(); - struct timespec ts, ts2, *tsp; - pthread_cond_t cv; - int ret; - - cv = *cond; - THR_UMUTEX_LOCK(curthread, &cv->c_lock); - _pthread_mutex_unlock(mutex); - - if (abstime != NULL) { - clock_gettime(cv->c_clockid, &ts); - TIMESPEC_SUB(&ts2, abstime, &ts); - tsp = &ts2; - } else - tsp = NULL; - - ret = _thr_ucond_wait(&cv->c_kerncv, &cv->c_lock, tsp, 0); - if (ret == EINTR) - ret = 0; - return (ret); -} - -int -_pthread_cond_broadcast_unlock(pthread_cond_t *cond, pthread_mutex_t *mutex, int broadcast) -{ - struct pthread *curthread = _get_curthread(); - pthread_cond_t cv; - int ret = 0; - - /* - * If the condition variable is statically initialized, perform dynamic - * initialization. - */ - if (__predict_false(*cond == NULL && - (ret = init_static(curthread, cond)) != 0)) - return (ret); - - cv = *cond; - THR_UMUTEX_LOCK(curthread, &cv->c_lock); - _pthread_mutex_unlock(mutex); - if (!broadcast) - ret = _thr_ucond_signal(&cv->c_kerncv); - else - ret = _thr_ucond_broadcast(&cv->c_kerncv); - THR_UMUTEX_UNLOCK(curthread, &cv->c_lock); - return (ret); -} - ==== //depot/projects/arm/src/lib/libthr/thread/thr_private.h#13 (text+ko) ==== @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_private.h,v 1.87 2008/04/02 04:32:31 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_private.h,v 1.92 2008/04/03 02:47:35 davidxu Exp $ */ #ifndef _THR_PRIVATE_H @@ -460,8 +460,10 @@ (thrd)->critical_count++ #define THR_CRITICAL_LEAVE(thrd) \ - (thrd)->critical_count--; \ - _thr_ast(thrd); + do { \ + (thrd)->critical_count--; \ + _thr_ast(thrd); \ + } while (0) #define THR_UMUTEX_TRYLOCK(thrd, lck) \ _thr_umutex_trylock((lck), TID(thrd)) @@ -668,10 +670,6 @@ void _thread_bp_create(void); void _thread_bp_death(void); int _sched_yield(void); -int _pthread_getaffinity_np(pthread_t, size_t, cpuset_t *); -int _pthread_setaffinity_np(pthread_t, size_t, const cpuset_t *); -int _pthread_cond_wait_unlocked(pthread_cond_t *, pthread_mutex_t *, const struct timespec *) __hidden; -int _pthread_cond_broadcast_unlock(pthread_cond_t *, pthread_mutex_t *, int broadcast); /* #include */ #ifdef _SYS_FCNTL_H_ @@ -709,6 +707,8 @@ void __sys_exit(int); #endif +int _umtx_op_err(void *, int op, u_long, void *, void *) __hidden; + static inline int _thr_isthreaded(void) { ==== //depot/projects/arm/src/lib/libthr/thread/thr_rtld.c#5 (text) ==== @@ -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/libthr/thread/thr_rtld.c,v 1.6 2008/03/21 02:31:55 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_rtld.c,v 1.7 2008/04/02 07:41:24 davidxu Exp $ * */ @@ -219,7 +219,7 @@ curthread = _get_curthread(); /* force to resolve _umtx_op PLT */ - _umtx_op((struct umtx *)&dummy, UMTX_OP_WAKE, 1, 0, 0); + _umtx_op_err((struct umtx *)&dummy, UMTX_OP_WAKE, 1, 0, 0); /* force to resolve errno() PLT */ __error(); ==== //depot/projects/arm/src/lib/libthr/thread/thr_umtx.c#10 (text+ko) ==== @@ -23,13 +23,22 @@ * (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/libthr/thread/thr_umtx.c,v 1.14 2008/04/02 04:32:31 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_umtx.c,v 1.15 2008/04/02 07:41:24 davidxu Exp $ * */ #include "thr_private.h" #include "thr_umtx.h" +#ifndef HAS__UMTX_OP_ERR +int _umtx_op_err(void *obj, int op, u_long val, void *uaddr, void *uaddr2) +{ + if (_umtx_op(obj, op, val, uaddr, uaddr2) == -1) + return (errno); + return (0); +} +#endif + void _thr_umutex_init(struct umutex *mtx) { @@ -41,9 +50,7 @@ int __thr_umutex_lock(struct umutex *mtx) { - if (_umtx_op(mtx, UMTX_OP_MUTEX_LOCK, 0, 0, 0) != -1) - return 0; - return (errno); + return _umtx_op_err(mtx, UMTX_OP_MUTEX_LOCK, 0, 0, 0); } int @@ -53,35 +60,27 @@ if (timeout && (timeout->tv_sec < 0 || (timeout->tv_sec == 0 && timeout->tv_nsec <= 0))) return (ETIMEDOUT); - if (_umtx_op(mtx, UMTX_OP_MUTEX_LOCK, 0, 0, - __DECONST(void *, timeout)) != -1) - return (0); - return (errno); + return _umtx_op_err(mtx, UMTX_OP_MUTEX_LOCK, 0, 0, + __DECONST(void *, timeout)); } int __thr_umutex_unlock(struct umutex *mtx) { - if (_umtx_op(mtx, UMTX_OP_MUTEX_UNLOCK, 0, 0, 0) != -1) - return (0); - return (errno); + return _umtx_op_err(mtx, UMTX_OP_MUTEX_UNLOCK, 0, 0, 0); } int __thr_umutex_trylock(struct umutex *mtx) { - if (_umtx_op(mtx, UMTX_OP_MUTEX_TRYLOCK, 0, 0, 0) != -1) - return (0); - return (errno); + return _umtx_op_err(mtx, UMTX_OP_MUTEX_TRYLOCK, 0, 0, 0); } int __thr_umutex_set_ceiling(struct umutex *mtx, uint32_t ceiling, uint32_t *oldceiling) { - if (_umtx_op(mtx, UMTX_OP_SET_CEILING, ceiling, oldceiling, 0) != -1) - return (0); - return (errno); + return _umtx_op_err(mtx, UMTX_OP_SET_CEILING, ceiling, oldceiling, 0); } int @@ -90,10 +89,8 @@ if (timeout && (timeout->tv_sec < 0 || (timeout->tv_sec == 0 && timeout->tv_nsec <= 0))) return (ETIMEDOUT); - if (_umtx_op(__DEVOLATILE(void *, mtx), UMTX_OP_WAIT, id, 0, - __DECONST(void*, timeout)) != -1) - return (0); - return (errno); + return _umtx_op_err(__DEVOLATILE(void *, mtx), UMTX_OP_WAIT, id, 0, + __DECONST(void*, timeout)); } int @@ -102,19 +99,15 @@ if (timeout && (timeout->tv_sec < 0 || (timeout->tv_sec == 0 && timeout->tv_nsec <= 0))) return (ETIMEDOUT); - if (_umtx_op(__DEVOLATILE(void *, mtx), UMTX_OP_WAIT_UINT, id, 0, - __DECONST(void*, timeout)) != -1) - return (0); - return (errno); + return _umtx_op_err(__DEVOLATILE(void *, mtx), UMTX_OP_WAIT_UINT, id, 0, + __DECONST(void*, timeout)); } int _thr_umtx_wake(volatile void *mtx, int nr_wakeup) { - if (_umtx_op(__DEVOLATILE(void *, mtx), UMTX_OP_WAKE, - nr_wakeup, 0, 0) != -1) - return (0); - return (errno); + return _umtx_op_err(__DEVOLATILE(void *, mtx), UMTX_OP_WAKE, + nr_wakeup, 0, 0); } void @@ -132,12 +125,9 @@ __thr_umutex_unlock(m); return (ETIMEDOUT); } - if (_umtx_op(cv, UMTX_OP_CV_WAIT, + return _umtx_op_err(cv, UMTX_OP_CV_WAIT, check_unparking ? UMTX_CHECK_UNPARKING : 0, - m, __DECONST(void*, timeout)) != -1) { - return (0); - } - return (errno); + m, __DECONST(void*, timeout)); } int @@ -145,9 +135,7 @@ { if (!cv->c_has_waiters) return (0); - if (_umtx_op(cv, UMTX_OP_CV_SIGNAL, 0, NULL, NULL) != -1) - return (0); - return (errno); + return _umtx_op_err(cv, UMTX_OP_CV_SIGNAL, 0, NULL, NULL); } int @@ -155,31 +143,23 @@ { if (!cv->c_has_waiters) return (0); - if (_umtx_op(cv, UMTX_OP_CV_BROADCAST, 0, NULL, NULL) != -1) - return (0); - return (errno); + return _umtx_op_err(cv, UMTX_OP_CV_BROADCAST, 0, NULL, NULL); } int __thr_rwlock_rdlock(struct urwlock *rwlock, int flags, struct timespec *tsp) { - if (_umtx_op(rwlock, UMTX_OP_RW_RDLOCK, flags, NULL, tsp) != -1) - return (0); - return (errno); + return _umtx_op_err(rwlock, UMTX_OP_RW_RDLOCK, flags, NULL, tsp); } int __thr_rwlock_wrlock(struct urwlock *rwlock, struct timespec *tsp) { - if (_umtx_op(rwlock, UMTX_OP_RW_WRLOCK, 0, NULL, tsp) != -1) - return (0); - return (errno); + return _umtx_op_err(rwlock, UMTX_OP_RW_WRLOCK, 0, NULL, tsp); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Apr 4 07:16:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 995C61065678; Fri, 4 Apr 2008 07:16:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 42A271065677 for ; Fri, 4 Apr 2008 07:16:23 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2EAF28FC21 for ; Fri, 4 Apr 2008 07:16:23 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m347GNJ8004206 for ; Fri, 4 Apr 2008 07:16:23 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m347GMTe004204 for perforce@freebsd.org; Fri, 4 Apr 2008 07:16:22 GMT (envelope-from imp@freebsd.org) Date: Fri, 4 Apr 2008 07:16:22 GMT Message-Id: <200804040716.m347GMTe004204@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 139326 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Apr 2008 07:16:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=139326 Change 139326 by imp@imp_paco-paco on 2008/04/04 07:15:30 IFC @139323 Affected files ... .. //depot/projects/mips2/src/bin/ls/ls.1#3 integrate .. //depot/projects/mips2/src/bin/ls/ls.c#2 integrate .. //depot/projects/mips2/src/bin/ls/ls.h#2 integrate .. //depot/projects/mips2/src/bin/ls/print.c#3 integrate .. //depot/projects/mips2/src/bin/ls/util.c#2 integrate .. //depot/projects/mips2/src/etc/rc.d/zfs#4 integrate .. //depot/projects/mips2/src/games/fortune/datfiles/fortunes#11 integrate .. //depot/projects/mips2/src/lib/libc/gen/err.c#3 integrate .. //depot/projects/mips2/src/lib/libc/gen/msgctl.3#3 integrate .. //depot/projects/mips2/src/lib/libc/include/namespace.h#4 integrate .. //depot/projects/mips2/src/lib/libc/include/un-namespace.h#4 integrate .. //depot/projects/mips2/src/lib/libc/sys/aio_cancel.2#2 integrate .. //depot/projects/mips2/src/lib/libc/sys/aio_suspend.2#2 integrate .. //depot/projects/mips2/src/lib/libthr/arch/amd64/Makefile.inc#3 integrate .. //depot/projects/mips2/src/lib/libthr/arch/amd64/amd64/_umtx_op_err.S#1 branch .. //depot/projects/mips2/src/lib/libthr/arch/amd64/include/pthread_md.h#3 integrate .. //depot/projects/mips2/src/lib/libthr/arch/i386/Makefile.inc#3 integrate .. //depot/projects/mips2/src/lib/libthr/arch/i386/i386/_umtx_op_err.S#1 branch .. //depot/projects/mips2/src/lib/libthr/arch/i386/include/pthread_md.h#3 integrate .. //depot/projects/mips2/src/lib/libthr/thread/thr_affinity.c#3 integrate .. //depot/projects/mips2/src/lib/libthr/thread/thr_cond.c#4 integrate .. //depot/projects/mips2/src/lib/libthr/thread/thr_private.h#10 integrate .. //depot/projects/mips2/src/lib/libthr/thread/thr_rtld.c#5 integrate .. //depot/projects/mips2/src/lib/libthr/thread/thr_umtx.c#6 integrate .. //depot/projects/mips2/src/lib/msun/src/s_fma.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/s_fmal.c#3 integrate .. //depot/projects/mips2/src/sbin/fsck_ffs/main.c#6 integrate .. //depot/projects/mips2/src/sbin/restore/dirs.c#3 integrate .. //depot/projects/mips2/src/sbin/restore/interactive.c#2 integrate .. //depot/projects/mips2/src/share/mk/sys.mk#12 integrate .. //depot/projects/mips2/src/sys/arm/arm/bus_space_generic.c#1 branch .. //depot/projects/mips2/src/sys/arm/arm/machdep.c#5 integrate .. //depot/projects/mips2/src/sys/arm/at91/kb920x_machdep.c#8 integrate .. //depot/projects/mips2/src/sys/arm/include/machdep.h#2 integrate .. //depot/projects/mips2/src/sys/arm/sa11x0/assabet_machdep.c#4 integrate .. //depot/projects/mips2/src/sys/arm/sa11x0/files.sa11x0#3 integrate .. //depot/projects/mips2/src/sys/arm/sa11x0/sa11x0_io.c#3 integrate .. //depot/projects/mips2/src/sys/arm/xscale/i80321/ep80219_machdep.c#4 integrate .. //depot/projects/mips2/src/sys/arm/xscale/i80321/files.ep80219#2 integrate .. //depot/projects/mips2/src/sys/arm/xscale/i80321/files.i80219#2 integrate .. //depot/projects/mips2/src/sys/arm/xscale/i80321/files.i80321#2 integrate .. //depot/projects/mips2/src/sys/arm/xscale/i80321/files.iq31244#2 integrate .. //depot/projects/mips2/src/sys/arm/xscale/i80321/iq31244_machdep.c#5 integrate .. //depot/projects/mips2/src/sys/arm/xscale/i80321/obio_space.c#3 integrate .. //depot/projects/mips2/src/sys/arm/xscale/i8134x/crb_machdep.c#4 integrate .. //depot/projects/mips2/src/sys/arm/xscale/i8134x/obio_space.c#2 integrate .. //depot/projects/mips2/src/sys/arm/xscale/ixp425/avila_machdep.c#4 integrate .. //depot/projects/mips2/src/sys/arm/xscale/ixp425/files.avila#2 integrate .. //depot/projects/mips2/src/sys/arm/xscale/ixp425/files.ixp425#3 integrate .. //depot/projects/mips2/src/sys/arm/xscale/ixp425/ixp425_a4x_space.c#2 integrate .. //depot/projects/mips2/src/sys/arm/xscale/ixp425/ixp425_space.c#2 integrate .. //depot/projects/mips2/src/sys/conf/Makefile.arm#6 integrate .. //depot/projects/mips2/src/sys/conf/NOTES#19 integrate .. //depot/projects/mips2/src/sys/conf/files#23 integrate .. //depot/projects/mips2/src/sys/dev/aac/aac_disk.c#3 integrate .. //depot/projects/mips2/src/sys/dev/em/e1000_80003es2lan.c#4 integrate .. //depot/projects/mips2/src/sys/dev/em/e1000_82540.c#4 integrate .. //depot/projects/mips2/src/sys/dev/em/e1000_82541.c#4 integrate .. //depot/projects/mips2/src/sys/dev/em/e1000_82542.c#4 integrate .. //depot/projects/mips2/src/sys/dev/em/e1000_82543.c#4 integrate .. //depot/projects/mips2/src/sys/dev/em/e1000_82571.c#4 integrate .. //depot/projects/mips2/src/sys/dev/em/e1000_82571.h#4 integrate .. //depot/projects/mips2/src/sys/dev/em/e1000_api.c#4 integrate .. //depot/projects/mips2/src/sys/dev/em/e1000_api.h#4 integrate .. //depot/projects/mips2/src/sys/dev/em/e1000_defines.h#4 integrate .. //depot/projects/mips2/src/sys/dev/em/e1000_hw.h#4 integrate .. //depot/projects/mips2/src/sys/dev/em/e1000_ich8lan.c#4 integrate .. //depot/projects/mips2/src/sys/dev/em/e1000_ich8lan.h#4 integrate .. //depot/projects/mips2/src/sys/dev/em/e1000_mac.c#4 integrate .. //depot/projects/mips2/src/sys/dev/em/e1000_mac.h#4 integrate .. //depot/projects/mips2/src/sys/dev/em/e1000_manage.c#4 integrate .. //depot/projects/mips2/src/sys/dev/em/e1000_nvm.c#4 integrate .. //depot/projects/mips2/src/sys/dev/em/e1000_nvm.h#4 integrate .. //depot/projects/mips2/src/sys/dev/em/e1000_osdep.c#1 branch .. //depot/projects/mips2/src/sys/dev/em/e1000_osdep.h#4 integrate .. //depot/projects/mips2/src/sys/dev/em/e1000_phy.c#4 integrate .. //depot/projects/mips2/src/sys/dev/em/e1000_phy.h#4 integrate .. //depot/projects/mips2/src/sys/dev/em/if_em.c#10 integrate .. //depot/projects/mips2/src/sys/dev/em/if_em.h#9 integrate .. //depot/projects/mips2/src/sys/dev/igb/e1000_mac.c#2 integrate .. //depot/projects/mips2/src/sys/dev/igb/e1000_osdep.c#1 branch .. //depot/projects/mips2/src/sys/dev/igb/if_igb.c#2 integrate .. //depot/projects/mips2/src/sys/dev/mpt/mpt.c#8 integrate .. //depot/projects/mips2/src/sys/dev/mxge/if_mxge.c#9 integrate .. //depot/projects/mips2/src/sys/kern/kern_clock.c#10 integrate .. //depot/projects/mips2/src/sys/kern/kern_conf.c#6 integrate .. //depot/projects/mips2/src/sys/kern/kern_cpuset.c#5 integrate .. //depot/projects/mips2/src/sys/kern/kern_event.c#8 integrate .. //depot/projects/mips2/src/sys/kern/kern_intr.c#9 integrate .. //depot/projects/mips2/src/sys/kern/kern_timeout.c#10 integrate .. //depot/projects/mips2/src/sys/kern/kern_umtx.c#7 integrate .. //depot/projects/mips2/src/sys/kern/sched_ule.c#14 integrate .. //depot/projects/mips2/src/sys/kern/subr_sleepqueue.c#11 integrate .. //depot/projects/mips2/src/sys/kern/vfs_subr.c#17 integrate .. //depot/projects/mips2/src/sys/modules/em/Makefile#5 integrate .. //depot/projects/mips2/src/sys/modules/igb/Makefile#3 integrate .. //depot/projects/mips2/src/sys/powerpc/include/asm.h#2 integrate .. //depot/projects/mips2/src/sys/powerpc/psim/openpic_iobus.c#5 integrate .. //depot/projects/mips2/src/sys/sys/callout.h#5 integrate .. //depot/projects/mips2/src/sys/sys/cpuset.h#5 integrate .. //depot/projects/mips2/src/tools/regression/lib/msun/Makefile#5 integrate .. //depot/projects/mips2/src/tools/regression/lib/msun/test-fma.c#1 branch .. //depot/projects/mips2/src/tools/regression/lib/msun/test-fma.t#1 branch .. //depot/projects/mips2/src/tools/tools/mctest/Makefile#1 branch .. //depot/projects/mips2/src/tools/tools/mctest/mctest.1#1 branch .. //depot/projects/mips2/src/tools/tools/mctest/mctest.cc#2 integrate .. //depot/projects/mips2/src/tools/tools/mctest/mctest.h#2 integrate .. //depot/projects/mips2/src/usr.bin/kdump/kdump.1#3 integrate .. //depot/projects/mips2/src/usr.bin/kdump/kdump.c#9 integrate .. //depot/projects/mips2/src/usr.bin/ktrace/ktrace.1#4 integrate .. //depot/projects/mips2/src/usr.bin/ktrace/ktrace.c#4 integrate Differences ... ==== //depot/projects/mips2/src/bin/ls/ls.1#3 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.100 2006/10/12 10:08:52 ru Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.102 2008/04/04 05:55:42 ru Exp $ .\" -.Dd October 12, 2006 +.Dd April 4, 2008 .Dt LS 1 .Os .Sh NAME @@ -41,6 +41,7 @@ .Sh SYNOPSIS .Nm .Op Fl ABCFGHILPRSTUWZabcdfghiklmnopqrstuwx1 +.Op Fl D Ar format .Op Ar .Sh DESCRIPTION For each operand that names a @@ -88,6 +89,21 @@ is the numeric value of the character in octal. .It Fl C Force multi-column output; this is the default when output is to a terminal. +.It Fl D Ar format +When printing in the long +.Pq Fl l +format, use +.Ar format +to format the date and time output. +The argument +.Ar format +is a string used by +.Xr strftime 3 . +Depending on the choice of format string, this may result in a +different number of columns in the output. +This option overrides the +.Fl T +option. .It Fl F Display a slash .Pq Ql / @@ -146,12 +162,13 @@ Sort by size (largest file first) before sorting the operands in lexicographical order. .It Fl T -When used with the -.Fl l -(lowercase letter -.Dq ell ) -option, display complete time information for the file, including +When printing in the long +.Pq Fl l +format, display complete time information for the file, including month, day, hour, minute, second, and year. +The +.Fl D +option gives even more control over the output format. .It Fl U Use time when file was created for sorting or printing. .It Fl W @@ -325,7 +342,12 @@ modified, and the pathname. .Pp If the modification time of the file is more than 6 months -in the past or future, then the year of the last modification +in the past or future, and the +.Fl D +or +.Fl T +are not specified, +then the year of the last modification is displayed in place of the hour and minute fields. .Pp If the owner or group names are not a known user or group name, @@ -657,6 +679,7 @@ .Xr getfacl 1 , .Xr sort 1 , .Xr xterm 1 , +.Xr strftime 3 , .Xr termcap 5 , .Xr maclabel 7 , .Xr symlink 7 , ==== //depot/projects/mips2/src/bin/ls/ls.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.85 2006/03/24 17:09:03 jhb Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.86 2008/04/04 03:57:46 grog Exp $"); #include #include @@ -125,10 +125,11 @@ static int f_singlecol; /* use single column output */ int f_size; /* list size in short listing */ int f_slash; /* similar to f_type, but only for dirs */ - int f_sortacross; /* sort across rows, not down columns */ + int f_sortacross; /* sort across rows, not down columns */ int f_statustime; /* use time of last mode change */ static int f_stream; /* stream the output, separate with commas */ static int f_timesort; /* sort by time vice name */ + char *f_timeformat; /* user-specified time format */ static int f_sizesort; int f_type; /* add type character for non-regular files */ static int f_whiteout; /* show whiteout entries */ @@ -179,7 +180,7 @@ fts_options = FTS_PHYSICAL; while ((ch = getopt(argc, argv, - "1ABCFGHILPRSTUWZabcdfghiklmnopqrstuwx")) != -1) { + "1ABCD:FGHILPRSTUWZabcdfghiklmnopqrstuwx")) != -1) { switch (ch) { /* * The -1, -C, -x and -l options all override each other so @@ -198,6 +199,9 @@ case 'C': f_sortacross = f_longform = f_singlecol = 0; break; + case 'D': + f_timeformat = optarg; + break; case 'l': f_longform = 1; f_singlecol = 0; ==== //depot/projects/mips2/src/bin/ls/ls.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * from: @(#)ls.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD: src/bin/ls/ls.h,v 1.22 2006/03/24 16:38:02 jhb Exp $ + * $FreeBSD: src/bin/ls/ls.h,v 1.23 2008/04/04 03:57:46 grog Exp $ */ #define NO_PRINT 1 @@ -50,8 +50,9 @@ extern int f_sectime; /* print the real time for all files */ extern int f_size; /* list size in short listing */ extern int f_slash; /* append a '/' if the file is a directory */ -extern int f_sortacross; /* sort across rows, not down columns */ +extern int f_sortacross; /* sort across rows, not down columns */ extern int f_statustime; /* use time of last mode change */ +extern char *f_timeformat; /* user-specified time format */ extern int f_notabs; /* don't use tab-separated multi-col output */ extern int f_type; /* add type character for non-regular files */ #ifdef COLORLS ==== //depot/projects/mips2/src/bin/ls/print.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.76 2006/10/18 10:58:27 ru Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.77 2008/04/04 03:57:46 grog Exp $"); #include #include @@ -168,7 +168,7 @@ prevdev = sp->st_dev; } np = p->fts_pointer; - (void)printf("%s %*u %-*s %-*s ", buf, dp->s_nlink, + (void)printf("%s %*u %-*s %-*s ", buf, dp->s_nlink, sp->st_nlink, dp->s_user, np->user, dp->s_group, np->group); if (f_flags) @@ -237,7 +237,7 @@ if (chcnt) putchar('\n'); } - + void printcol(const DISPLAY *dp) { @@ -378,17 +378,20 @@ now = time(NULL); #define SIXMONTHS ((365 / 2) * 86400) - if (f_sectime) + if (f_timeformat) /* user specified format */ + format = f_timeformat; + else if (f_sectime) /* mmm dd hh:mm:ss yyyy || dd mmm hh:mm:ss yyyy */ - format = d_first ? "%e %b %T %Y " : "%b %e %T %Y "; + format = d_first ? "%e %b %T %Y" : "%b %e %T %Y"; else if (ftime + SIXMONTHS > now && ftime < now + SIXMONTHS) /* mmm dd hh:mm || dd mmm hh:mm */ - format = d_first ? "%e %b %R " : "%b %e %R "; + format = d_first ? "%e %b %R" : "%b %e %R"; else /* mmm dd yyyy || dd mmm yyyy */ - format = d_first ? "%e %b %Y " : "%b %e %Y "; + format = d_first ? "%e %b %Y" : "%b %e %Y"; strftime(longstring, sizeof(longstring), format, localtime(&ftime)); fputs(longstring, stdout); + fputc(' ', stdout); } static int @@ -625,7 +628,7 @@ snprintf(name, sizeof(name), "%s", p->fts_name); else snprintf(name, sizeof(name), "%s/%s", - p->fts_parent->fts_accpath, p->fts_name); + p->fts_parent->fts_accpath, p->fts_name); /* * We have no way to tell whether a symbolic link has an ACL since * pathconf() and acl_get_file() both follow them. They also don't ==== //depot/projects/mips2/src/bin/ls/util.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/util.c,v 1.40 2006/03/24 16:38:02 jhb Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/util.c,v 1.41 2008/04/04 05:55:42 ru Exp $"); #include #include @@ -222,9 +222,9 @@ { (void)fprintf(stderr, #ifdef COLORLS - "usage: ls [-ABCFGHILPRSTUWZabcdfghiklmnopqrstuwx1]" + "usage: ls [-ABCFGHILPRSTUWZabcdfghiklmnopqrstuwx1] [-D format]" #else - "usage: ls [-ABCFHILPRSTUWZabcdfghiklmnopqrstuwx1]" + "usage: ls [-ABCFHILPRSTUWZabcdfghiklmnopqrstuwx1] [-D format]" #endif " [file ...]\n"); exit(1); ==== //depot/projects/mips2/src/etc/rc.d/zfs#4 (text+ko) ==== @@ -1,11 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/zfs,v 1.6 2008/03/19 14:44:55 pjd Exp $ +# $FreeBSD: src/etc/rc.d/zfs,v 1.7 2008/04/02 19:29:16 dougb Exp $ # # PROVIDE: zfs # REQUIRE: mountcritlocal -# BEFORE: mountcritremote . /etc/rc.subr ==== //depot/projects/mips2/src/games/fortune/datfiles/fortunes#11 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.259 2008/03/31 10:28:09 ganbold Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.260 2008/04/03 10:22:56 yar Exp $ % ======================================================================= || || @@ -46075,6 +46075,12 @@ The greatest griefs are those we cause ourselves. -- Sophocles % +The greatest joy a man can know is to conquer his enemies and drive them +before him. To ride their horses and take away their possessions. To see +the faces of those who were dear to them bedewed with tears, and to clasp +their wives and daughters to his arms. + -- Chinggis (Genghis) Khan +% The greatest love is a mother's, then a dog's, then a sweetheart's. -- Polish proverb % ==== //depot/projects/mips2/src/lib/libc/gen/err.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ static char sccsid[] = "@(#)err.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/err.c,v 1.14 2007/01/09 00:27:53 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/err.c,v 1.15 2008/04/03 20:36:44 imp Exp $"); #include "namespace.h" #include @@ -97,11 +97,7 @@ } void -verrc(eval, code, fmt, ap) - int eval; - int code; - const char *fmt; - va_list ap; +verrc(int eval, int code, const char *fmt, va_list ap) { if (err_file == 0) err_set_file((FILE *)0); @@ -126,10 +122,7 @@ } void -verrx(eval, fmt, ap) - int eval; - const char *fmt; - va_list ap; +verrx(int eval, const char *fmt, va_list ap) { if (err_file == 0) err_set_file((FILE *)0); @@ -154,9 +147,7 @@ } void -vwarn(fmt, ap) - const char *fmt; - va_list ap; +vwarn(const char *fmt, va_list ap) { vwarnc(errno, fmt, ap); } @@ -171,10 +162,7 @@ } void -vwarnc(code, fmt, ap) - int code; - const char *fmt; - va_list ap; +vwarnc(int code, const char *fmt, va_list ap) { if (err_file == 0) err_set_file((FILE *)0); @@ -196,9 +184,7 @@ } void -vwarnx(fmt, ap) - const char *fmt; - va_list ap; +vwarnx(const char *fmt, va_list ap) { if (err_file == 0) err_set_file((FILE *)0); ==== //depot/projects/mips2/src/lib/libc/gen/msgctl.3#3 (text+ko) ==== @@ -29,9 +29,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/msgctl.3,v 1.20 2006/08/09 18:05:44 maxim Exp $ +.\" $FreeBSD: src/lib/libc/gen/msgctl.3,v 1.21 2008/04/03 16:21:43 ru Exp $ .\"/ -.Dd November 24, 1997 +.Dd April 3, 2008 .Dt MSGCTL 3 .Os .Sh NAME @@ -65,9 +65,9 @@ struct ipc_perm msg_perm; /* msg queue permission bits */ struct msg *msg_first; /* first message in the queue */ struct msg *msg_last; /* last message in the queue */ - u_long msg_cbytes; /* number of bytes in use on the queue */ - u_long msg_qnum; /* number of msgs in the queue */ - u_long msg_qbytes; /* max # of bytes on the queue */ + msglen_t msg_cbytes; /* number of bytes in use on the queue */ + msgqnum_t msg_qnum; /* number of msgs in the queue */ + msglen_t msg_qbytes; /* max # of bytes on the queue */ pid_t msg_lspid; /* pid of last msgsnd() */ pid_t msg_lrpid; /* pid of last msgrcv() */ time_t msg_stime; /* time of last msgsnd() */ @@ -89,13 +89,13 @@ and looks like this: .Bd -literal struct ipc_perm { - ushort cuid; /* creator user id */ - ushort cgid; /* creator group id */ - ushort uid; /* user id */ - ushort gid; /* group id */ - ushort mode; /* r/w permission */ - ushort seq; /* sequence # (to generate unique msg/sem/shm id) */ - key_t key; /* user specified msg/sem/shm key */ + unsigned short cuid; /* creator user id */ + unsigned short cgid; /* creator group id */ + unsigned short uid; /* user id */ + unsigned short gid; /* group id */ + unsigned short mode; /* r/w permission */ + unsigned short seq; /* sequence # (to generate unique ipcid) */ + key_t key; /* user specified msg/sem/shm key */ }; .Ed .Pp ==== //depot/projects/mips2/src/lib/libc/include/namespace.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/include/namespace.h,v 1.22 2008/03/25 15:33:00 ru Exp $ + * $FreeBSD: src/lib/libc/include/namespace.h,v 1.23 2008/04/02 08:53:18 davidxu Exp $ */ #ifndef _NAMESPACE_H_ @@ -132,6 +132,7 @@ #define pthread_detach _pthread_detach #define pthread_equal _pthread_equal #define pthread_exit _pthread_exit +#define pthread_getaffinity_np _pthread_getaffinity_np #define pthread_getconcurrency _pthread_getconcurrency #define pthread_getcpuclockid _pthread_getcpuclockid #define pthread_getprio _pthread_getprio @@ -182,6 +183,7 @@ #define pthread_rwlockattr_setpshared _pthread_rwlockattr_setpshared #define pthread_self _pthread_self #define pthread_set_name_np _pthread_set_name_np +#define pthread_setaffinity_np _pthread_setaffinity_np #define pthread_setcancelstate _pthread_setcancelstate #define pthread_setcanceltype _pthread_setcanceltype #define pthread_setconcurrency _pthread_setconcurrency ==== //depot/projects/mips2/src/lib/libc/include/un-namespace.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/include/un-namespace.h,v 1.19 2008/03/25 13:28:12 ru Exp $ + * $FreeBSD: src/lib/libc/include/un-namespace.h,v 1.20 2008/04/02 08:53:18 davidxu Exp $ */ #ifndef _UN_NAMESPACE_H_ @@ -113,6 +113,7 @@ #undef pthread_detach #undef pthread_equal #undef pthread_exit +#undef pthread_getaffinity_np #undef pthread_getconcurrency #undef pthread_getcpuclockid #undef pthread_getprio @@ -163,6 +164,7 @@ #undef pthread_rwlockattr_setpshared #undef pthread_self #undef pthread_set_name_np +#undef pthread_setaffinity_np #undef pthread_setcancelstate #undef pthread_setcanceltype #undef pthread_setconcurrency ==== //depot/projects/mips2/src/lib/libc/sys/aio_cancel.2#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/aio_cancel.2,v 1.22 2003/01/13 10:37:11 tjr Exp $ +.\" $FreeBSD: src/lib/libc/sys/aio_cancel.2,v 1.23 2008/04/03 02:41:54 kevlo Exp $ .\" .Dd January 19, 2000 .Dt AIO_CANCEL 2 @@ -35,7 +35,7 @@ .Sh SYNOPSIS .In aio.h .Ft int -.Fn aio_cancel "int fildes" "struct aiocb * iocb" +.Fn aio_cancel "int fildes" "struct aiocb *iocb" .Sh DESCRIPTION The .Fn aio_cancel ==== //depot/projects/mips2/src/lib/libc/sys/aio_suspend.2#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/aio_suspend.2,v 1.22 2004/12/23 23:45:25 keramida Exp $ +.\" $FreeBSD: src/lib/libc/sys/aio_suspend.2,v 1.23 2008/04/03 02:41:54 kevlo Exp $ .\" .Dd June 2, 1999 .Dt AIO_SUSPEND 2 @@ -35,7 +35,7 @@ .Sh SYNOPSIS .In aio.h .Ft int -.Fn aio_suspend "const struct aiocb * const iocbs[]" "int niocb" "const struct timespec * timeout" +.Fn aio_suspend "const struct aiocb *const iocbs[]" "int niocb" "const struct timespec *timeout" .Sh DESCRIPTION The .Fn aio_suspend ==== //depot/projects/mips2/src/lib/libthr/arch/amd64/Makefile.inc#3 (text+ko) ==== @@ -1,5 +1,5 @@ -#$FreeBSD: src/lib/libthr/arch/amd64/Makefile.inc,v 1.3 2008/02/13 05:25:42 obrien Exp $ +#$FreeBSD: src/lib/libthr/arch/amd64/Makefile.inc,v 1.4 2008/04/02 07:41:23 davidxu Exp $ .PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH} -SRCS+= pthread_md.c +SRCS+= pthread_md.c _umtx_op_err.S ==== //depot/projects/mips2/src/lib/libthr/arch/amd64/include/pthread_md.h#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/lib/libthr/arch/amd64/include/pthread_md.h,v 1.4 2006/12/15 11:52:00 davidxu Exp $ + * $FreeBSD: src/lib/libthr/arch/amd64/include/pthread_md.h,v 1.5 2008/04/02 07:41:24 davidxu Exp $ */ /* @@ -97,4 +97,7 @@ { return (TCB_GET64(tcb_thread)); } + +#define HAS__UMTX_OP_ERR 1 + #endif ==== //depot/projects/mips2/src/lib/libthr/arch/i386/Makefile.inc#3 (text+ko) ==== @@ -1,5 +1,5 @@ -# $FreeBSD: src/lib/libthr/arch/i386/Makefile.inc,v 1.3 2008/02/13 05:25:43 obrien Exp $ +# $FreeBSD: src/lib/libthr/arch/i386/Makefile.inc,v 1.4 2008/04/02 07:41:24 davidxu Exp $ .PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH} -SRCS+= pthread_md.c +SRCS+= pthread_md.c _umtx_op_err.S ==== //depot/projects/mips2/src/lib/libthr/arch/i386/include/pthread_md.h#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/lib/libthr/arch/i386/include/pthread_md.h,v 1.8 2006/12/15 11:52:00 davidxu Exp $ + * $FreeBSD: src/lib/libthr/arch/i386/include/pthread_md.h,v 1.9 2008/04/02 07:41:24 davidxu Exp $ */ /* @@ -102,4 +102,7 @@ { return (TCB_GET32(tcb_thread)); } + +#define HAS__UMTX_OP_ERR 1 + #endif ==== //depot/projects/mips2/src/lib/libthr/thread/thr_affinity.c#3 (text+ko) ==== @@ -23,12 +23,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. * - * $FreeBSD: src/lib/libthr/thread/thr_affinity.c,v 1.2 2008/03/19 06:38:21 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_affinity.c,v 1.3 2008/04/02 11:41:12 davidxu Exp $ * */ #include "namespace.h" -#include +#include #include #include #include "un-namespace.h" ==== //depot/projects/mips2/src/lib/libthr/thread/thr_cond.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/lib/libthr/thread/thr_cond.c,v 1.24 2008/03/31 02:55:49 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_cond.c,v 1.25 2008/04/02 08:33:42 davidxu Exp $ */ #include "namespace.h" @@ -290,56 +290,3 @@ return (cond_signal_common(cond, 1)); } - -int -_pthread_cond_wait_unlocked(pthread_cond_t *cond, pthread_mutex_t *mutex, - const struct timespec *abstime) -{ - struct pthread *curthread = _get_curthread(); - struct timespec ts, ts2, *tsp; - pthread_cond_t cv; - int ret; - - cv = *cond; - THR_UMUTEX_LOCK(curthread, &cv->c_lock); - _pthread_mutex_unlock(mutex); - - if (abstime != NULL) { - clock_gettime(cv->c_clockid, &ts); - TIMESPEC_SUB(&ts2, abstime, &ts); - tsp = &ts2; - } else - tsp = NULL; - - ret = _thr_ucond_wait(&cv->c_kerncv, &cv->c_lock, tsp, 0); - if (ret == EINTR) - ret = 0; - return (ret); -} - -int -_pthread_cond_broadcast_unlock(pthread_cond_t *cond, pthread_mutex_t *mutex, int broadcast) -{ - struct pthread *curthread = _get_curthread(); - pthread_cond_t cv; - int ret = 0; - - /* - * If the condition variable is statically initialized, perform dynamic - * initialization. - */ - if (__predict_false(*cond == NULL && - (ret = init_static(curthread, cond)) != 0)) - return (ret); - - cv = *cond; - THR_UMUTEX_LOCK(curthread, &cv->c_lock); - _pthread_mutex_unlock(mutex); - if (!broadcast) - ret = _thr_ucond_signal(&cv->c_kerncv); - else - ret = _thr_ucond_broadcast(&cv->c_kerncv); - THR_UMUTEX_UNLOCK(curthread, &cv->c_lock); - return (ret); -} - ==== //depot/projects/mips2/src/lib/libthr/thread/thr_private.h#10 (text+ko) ==== @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_private.h,v 1.87 2008/04/02 04:32:31 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_private.h,v 1.92 2008/04/03 02:47:35 davidxu Exp $ */ #ifndef _THR_PRIVATE_H @@ -460,8 +460,10 @@ (thrd)->critical_count++ #define THR_CRITICAL_LEAVE(thrd) \ - (thrd)->critical_count--; \ - _thr_ast(thrd); + do { \ + (thrd)->critical_count--; \ + _thr_ast(thrd); \ + } while (0) #define THR_UMUTEX_TRYLOCK(thrd, lck) \ _thr_umutex_trylock((lck), TID(thrd)) @@ -668,10 +670,6 @@ void _thread_bp_create(void); void _thread_bp_death(void); int _sched_yield(void); -int _pthread_getaffinity_np(pthread_t, size_t, cpuset_t *); -int _pthread_setaffinity_np(pthread_t, size_t, const cpuset_t *); -int _pthread_cond_wait_unlocked(pthread_cond_t *, pthread_mutex_t *, const struct timespec *) __hidden; -int _pthread_cond_broadcast_unlock(pthread_cond_t *, pthread_mutex_t *, int broadcast); /* #include */ #ifdef _SYS_FCNTL_H_ @@ -709,6 +707,8 @@ void __sys_exit(int); #endif +int _umtx_op_err(void *, int op, u_long, void *, void *) __hidden; + static inline int _thr_isthreaded(void) { ==== //depot/projects/mips2/src/lib/libthr/thread/thr_rtld.c#5 (text) ==== @@ -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/libthr/thread/thr_rtld.c,v 1.6 2008/03/21 02:31:55 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_rtld.c,v 1.7 2008/04/02 07:41:24 davidxu Exp $ * */ @@ -219,7 +219,7 @@ curthread = _get_curthread(); /* force to resolve _umtx_op PLT */ - _umtx_op((struct umtx *)&dummy, UMTX_OP_WAKE, 1, 0, 0); + _umtx_op_err((struct umtx *)&dummy, UMTX_OP_WAKE, 1, 0, 0); /* force to resolve errno() PLT */ __error(); ==== //depot/projects/mips2/src/lib/libthr/thread/thr_umtx.c#6 (text+ko) ==== @@ -23,13 +23,22 @@ * (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/libthr/thread/thr_umtx.c,v 1.14 2008/04/02 04:32:31 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_umtx.c,v 1.15 2008/04/02 07:41:24 davidxu Exp $ * */ #include "thr_private.h" #include "thr_umtx.h" +#ifndef HAS__UMTX_OP_ERR +int _umtx_op_err(void *obj, int op, u_long val, void *uaddr, void *uaddr2) +{ + if (_umtx_op(obj, op, val, uaddr, uaddr2) == -1) + return (errno); + return (0); +} +#endif + void _thr_umutex_init(struct umutex *mtx) { @@ -41,9 +50,7 @@ int __thr_umutex_lock(struct umutex *mtx) { - if (_umtx_op(mtx, UMTX_OP_MUTEX_LOCK, 0, 0, 0) != -1) - return 0; - return (errno); + return _umtx_op_err(mtx, UMTX_OP_MUTEX_LOCK, 0, 0, 0); } int @@ -53,35 +60,27 @@ if (timeout && (timeout->tv_sec < 0 || (timeout->tv_sec == 0 && timeout->tv_nsec <= 0))) return (ETIMEDOUT); - if (_umtx_op(mtx, UMTX_OP_MUTEX_LOCK, 0, 0, - __DECONST(void *, timeout)) != -1) - return (0); - return (errno); + return _umtx_op_err(mtx, UMTX_OP_MUTEX_LOCK, 0, 0, + __DECONST(void *, timeout)); } int __thr_umutex_unlock(struct umutex *mtx) { - if (_umtx_op(mtx, UMTX_OP_MUTEX_UNLOCK, 0, 0, 0) != -1) - return (0); - return (errno); + return _umtx_op_err(mtx, UMTX_OP_MUTEX_UNLOCK, 0, 0, 0); } int __thr_umutex_trylock(struct umutex *mtx) { - if (_umtx_op(mtx, UMTX_OP_MUTEX_TRYLOCK, 0, 0, 0) != -1) - return (0); - return (errno); + return _umtx_op_err(mtx, UMTX_OP_MUTEX_TRYLOCK, 0, 0, 0); } int __thr_umutex_set_ceiling(struct umutex *mtx, uint32_t ceiling, uint32_t *oldceiling) { - if (_umtx_op(mtx, UMTX_OP_SET_CEILING, ceiling, oldceiling, 0) != -1) - return (0); - return (errno); + return _umtx_op_err(mtx, UMTX_OP_SET_CEILING, ceiling, oldceiling, 0); } int @@ -90,10 +89,8 @@ if (timeout && (timeout->tv_sec < 0 || (timeout->tv_sec == 0 && timeout->tv_nsec <= 0))) return (ETIMEDOUT); - if (_umtx_op(__DEVOLATILE(void *, mtx), UMTX_OP_WAIT, id, 0, - __DECONST(void*, timeout)) != -1) - return (0); - return (errno); + return _umtx_op_err(__DEVOLATILE(void *, mtx), UMTX_OP_WAIT, id, 0, + __DECONST(void*, timeout)); } int @@ -102,19 +99,15 @@ if (timeout && (timeout->tv_sec < 0 || (timeout->tv_sec == 0 && timeout->tv_nsec <= 0))) return (ETIMEDOUT); - if (_umtx_op(__DEVOLATILE(void *, mtx), UMTX_OP_WAIT_UINT, id, 0, - __DECONST(void*, timeout)) != -1) - return (0); - return (errno); + return _umtx_op_err(__DEVOLATILE(void *, mtx), UMTX_OP_WAIT_UINT, id, 0, + __DECONST(void*, timeout)); } int _thr_umtx_wake(volatile void *mtx, int nr_wakeup) { - if (_umtx_op(__DEVOLATILE(void *, mtx), UMTX_OP_WAKE, - nr_wakeup, 0, 0) != -1) - return (0); - return (errno); + return _umtx_op_err(__DEVOLATILE(void *, mtx), UMTX_OP_WAKE, + nr_wakeup, 0, 0); } void @@ -132,12 +125,9 @@ __thr_umutex_unlock(m); return (ETIMEDOUT); } - if (_umtx_op(cv, UMTX_OP_CV_WAIT, + return _umtx_op_err(cv, UMTX_OP_CV_WAIT, check_unparking ? UMTX_CHECK_UNPARKING : 0, - m, __DECONST(void*, timeout)) != -1) { - return (0); - } - return (errno); + m, __DECONST(void*, timeout)); } int @@ -145,9 +135,7 @@ { if (!cv->c_has_waiters) return (0); - if (_umtx_op(cv, UMTX_OP_CV_SIGNAL, 0, NULL, NULL) != -1) - return (0); - return (errno); + return _umtx_op_err(cv, UMTX_OP_CV_SIGNAL, 0, NULL, NULL); } int @@ -155,31 +143,23 @@ { if (!cv->c_has_waiters) return (0); - if (_umtx_op(cv, UMTX_OP_CV_BROADCAST, 0, NULL, NULL) != -1) - return (0); - return (errno); + return _umtx_op_err(cv, UMTX_OP_CV_BROADCAST, 0, NULL, NULL); } int __thr_rwlock_rdlock(struct urwlock *rwlock, int flags, struct timespec *tsp) { - if (_umtx_op(rwlock, UMTX_OP_RW_RDLOCK, flags, NULL, tsp) != -1) - return (0); - return (errno); + return _umtx_op_err(rwlock, UMTX_OP_RW_RDLOCK, flags, NULL, tsp); } int __thr_rwlock_wrlock(struct urwlock *rwlock, struct timespec *tsp) { - if (_umtx_op(rwlock, UMTX_OP_RW_WRLOCK, 0, NULL, tsp) != -1) - return (0); - return (errno); + return _umtx_op_err(rwlock, UMTX_OP_RW_WRLOCK, 0, NULL, tsp); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Apr 4 07:20:29 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 36EEE1065674; Fri, 4 Apr 2008 07:20:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ECEDC1065672 for ; Fri, 4 Apr 2008 07:20:28 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D94548FC24 for ; Fri, 4 Apr 2008 07:20:28 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m347KSHU004348 for ; Fri, 4 Apr 2008 07:20:28 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m347KSbE004346 for perforce@freebsd.org; Fri, 4 Apr 2008 07:20:28 GMT (envelope-from imp@freebsd.org) Date: Fri, 4 Apr 2008 07:20:28 GMT Message-Id: <200804040720.m347KSbE004346@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 139327 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Apr 2008 07:20:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=139327 Change 139327 by imp@imp_paco-paco on 2008/04/04 07:20:25 IF mips2 @139326 Affected files ... .. //depot/projects/mips2-jnpr/src/bin/ls/ls.1#2 integrate .. //depot/projects/mips2-jnpr/src/bin/ls/ls.c#2 integrate .. //depot/projects/mips2-jnpr/src/bin/ls/ls.h#2 integrate .. //depot/projects/mips2-jnpr/src/bin/ls/print.c#2 integrate .. //depot/projects/mips2-jnpr/src/bin/ls/util.c#2 integrate .. //depot/projects/mips2-jnpr/src/etc/rc.d/zfs#3 integrate .. //depot/projects/mips2-jnpr/src/games/fortune/datfiles/fortunes#5 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/gen/err.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/gen/msgctl.3#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/include/namespace.h#4 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/include/un-namespace.h#4 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/sys/aio_cancel.2#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/sys/aio_suspend.2#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libthr/arch/amd64/Makefile.inc#3 integrate .. //depot/projects/mips2-jnpr/src/lib/libthr/arch/amd64/amd64/_umtx_op_err.S#1 branch .. //depot/projects/mips2-jnpr/src/lib/libthr/arch/amd64/include/pthread_md.h#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libthr/arch/i386/Makefile.inc#3 integrate .. //depot/projects/mips2-jnpr/src/lib/libthr/arch/i386/i386/_umtx_op_err.S#1 branch .. //depot/projects/mips2-jnpr/src/lib/libthr/arch/i386/include/pthread_md.h#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libthr/thread/thr_affinity.c#3 integrate .. //depot/projects/mips2-jnpr/src/lib/libthr/thread/thr_cond.c#3 integrate .. //depot/projects/mips2-jnpr/src/lib/libthr/thread/thr_private.h#4 integrate .. //depot/projects/mips2-jnpr/src/lib/libthr/thread/thr_rtld.c#4 integrate .. //depot/projects/mips2-jnpr/src/lib/libthr/thread/thr_umtx.c#3 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_fma.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_fmal.c#2 integrate .. //depot/projects/mips2-jnpr/src/sbin/fsck_ffs/main.c#3 integrate .. //depot/projects/mips2-jnpr/src/sbin/restore/dirs.c#2 integrate .. //depot/projects/mips2-jnpr/src/sbin/restore/interactive.c#2 integrate .. //depot/projects/mips2-jnpr/src/share/mk/sys.mk#3 integrate .. //depot/projects/mips2-jnpr/src/sys/arm/arm/bus_space_generic.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/arm/arm/machdep.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/arm/at91/kb920x_machdep.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/arm/include/machdep.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/arm/sa11x0/assabet_machdep.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/arm/sa11x0/files.sa11x0#2 integrate .. //depot/projects/mips2-jnpr/src/sys/arm/sa11x0/sa11x0_io.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/arm/xscale/i80321/ep80219_machdep.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/arm/xscale/i80321/files.ep80219#2 integrate .. //depot/projects/mips2-jnpr/src/sys/arm/xscale/i80321/files.i80219#2 integrate .. //depot/projects/mips2-jnpr/src/sys/arm/xscale/i80321/files.i80321#2 integrate .. //depot/projects/mips2-jnpr/src/sys/arm/xscale/i80321/files.iq31244#2 integrate .. //depot/projects/mips2-jnpr/src/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/arm/xscale/i80321/obio_space.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/arm/xscale/i8134x/crb_machdep.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/arm/xscale/i8134x/obio_space.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/arm/xscale/ixp425/avila_machdep.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/arm/xscale/ixp425/files.avila#2 integrate .. //depot/projects/mips2-jnpr/src/sys/arm/xscale/ixp425/files.ixp425#2 integrate .. //depot/projects/mips2-jnpr/src/sys/arm/xscale/ixp425/ixp425_a4x_space.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/arm/xscale/ixp425/ixp425_space.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/conf/Makefile.arm#3 integrate .. //depot/projects/mips2-jnpr/src/sys/conf/NOTES#8 integrate .. //depot/projects/mips2-jnpr/src/sys/conf/files#10 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/aac/aac_disk.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/em/e1000_80003es2lan.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/em/e1000_82540.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/em/e1000_82541.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/em/e1000_82542.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/em/e1000_82543.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/em/e1000_82571.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/em/e1000_82571.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/em/e1000_api.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/em/e1000_api.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/em/e1000_defines.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/em/e1000_hw.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/em/e1000_ich8lan.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/em/e1000_ich8lan.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/em/e1000_mac.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/em/e1000_mac.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/em/e1000_manage.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/em/e1000_nvm.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/em/e1000_nvm.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/em/e1000_osdep.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/dev/em/e1000_osdep.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/em/e1000_phy.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/em/e1000_phy.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/em/if_em.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/em/if_em.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/igb/e1000_mac.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/igb/e1000_osdep.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/dev/igb/if_igb.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/mpt/mpt.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/mxge/if_mxge.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/kern_clock.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/kern_conf.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/kern_cpuset.c#5 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/kern_event.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/kern_intr.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/kern_timeout.c#5 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/kern_umtx.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/sched_ule.c#6 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/subr_sleepqueue.c#6 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/vfs_subr.c#8 integrate .. //depot/projects/mips2-jnpr/src/sys/modules/em/Makefile#4 integrate .. //depot/projects/mips2-jnpr/src/sys/modules/igb/Makefile#3 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/include/asm.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/psim/openpic_iobus.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/callout.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/cpuset.h#5 integrate .. //depot/projects/mips2-jnpr/src/tools/regression/lib/msun/Makefile#3 integrate .. //depot/projects/mips2-jnpr/src/tools/regression/lib/msun/test-fma.c#1 branch .. //depot/projects/mips2-jnpr/src/tools/regression/lib/msun/test-fma.t#1 branch .. //depot/projects/mips2-jnpr/src/tools/tools/mctest/Makefile#1 branch .. //depot/projects/mips2-jnpr/src/tools/tools/mctest/mctest.1#1 branch .. //depot/projects/mips2-jnpr/src/tools/tools/mctest/mctest.cc#2 integrate .. //depot/projects/mips2-jnpr/src/tools/tools/mctest/mctest.h#2 integrate .. //depot/projects/mips2-jnpr/src/usr.bin/kdump/kdump.1#3 integrate .. //depot/projects/mips2-jnpr/src/usr.bin/kdump/kdump.c#4 integrate .. //depot/projects/mips2-jnpr/src/usr.bin/ktrace/ktrace.1#3 integrate .. //depot/projects/mips2-jnpr/src/usr.bin/ktrace/ktrace.c#3 integrate Differences ... ==== //depot/projects/mips2-jnpr/src/bin/ls/ls.1#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.100 2006/10/12 10:08:52 ru Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.102 2008/04/04 05:55:42 ru Exp $ .\" -.Dd October 12, 2006 +.Dd April 4, 2008 .Dt LS 1 .Os .Sh NAME @@ -41,6 +41,7 @@ .Sh SYNOPSIS .Nm .Op Fl ABCFGHILPRSTUWZabcdfghiklmnopqrstuwx1 +.Op Fl D Ar format .Op Ar .Sh DESCRIPTION For each operand that names a @@ -88,6 +89,21 @@ is the numeric value of the character in octal. .It Fl C Force multi-column output; this is the default when output is to a terminal. +.It Fl D Ar format +When printing in the long +.Pq Fl l +format, use +.Ar format +to format the date and time output. +The argument +.Ar format +is a string used by +.Xr strftime 3 . +Depending on the choice of format string, this may result in a +different number of columns in the output. +This option overrides the +.Fl T +option. .It Fl F Display a slash .Pq Ql / @@ -146,12 +162,13 @@ Sort by size (largest file first) before sorting the operands in lexicographical order. .It Fl T -When used with the -.Fl l -(lowercase letter -.Dq ell ) -option, display complete time information for the file, including +When printing in the long +.Pq Fl l +format, display complete time information for the file, including month, day, hour, minute, second, and year. +The +.Fl D +option gives even more control over the output format. .It Fl U Use time when file was created for sorting or printing. .It Fl W @@ -325,7 +342,12 @@ modified, and the pathname. .Pp If the modification time of the file is more than 6 months -in the past or future, then the year of the last modification +in the past or future, and the +.Fl D +or +.Fl T +are not specified, +then the year of the last modification is displayed in place of the hour and minute fields. .Pp If the owner or group names are not a known user or group name, @@ -657,6 +679,7 @@ .Xr getfacl 1 , .Xr sort 1 , .Xr xterm 1 , +.Xr strftime 3 , .Xr termcap 5 , .Xr maclabel 7 , .Xr symlink 7 , ==== //depot/projects/mips2-jnpr/src/bin/ls/ls.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.85 2006/03/24 17:09:03 jhb Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.86 2008/04/04 03:57:46 grog Exp $"); #include #include @@ -125,10 +125,11 @@ static int f_singlecol; /* use single column output */ int f_size; /* list size in short listing */ int f_slash; /* similar to f_type, but only for dirs */ - int f_sortacross; /* sort across rows, not down columns */ + int f_sortacross; /* sort across rows, not down columns */ int f_statustime; /* use time of last mode change */ static int f_stream; /* stream the output, separate with commas */ static int f_timesort; /* sort by time vice name */ + char *f_timeformat; /* user-specified time format */ static int f_sizesort; int f_type; /* add type character for non-regular files */ static int f_whiteout; /* show whiteout entries */ @@ -179,7 +180,7 @@ fts_options = FTS_PHYSICAL; while ((ch = getopt(argc, argv, - "1ABCFGHILPRSTUWZabcdfghiklmnopqrstuwx")) != -1) { + "1ABCD:FGHILPRSTUWZabcdfghiklmnopqrstuwx")) != -1) { switch (ch) { /* * The -1, -C, -x and -l options all override each other so @@ -198,6 +199,9 @@ case 'C': f_sortacross = f_longform = f_singlecol = 0; break; + case 'D': + f_timeformat = optarg; + break; case 'l': f_longform = 1; f_singlecol = 0; ==== //depot/projects/mips2-jnpr/src/bin/ls/ls.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * from: @(#)ls.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD: src/bin/ls/ls.h,v 1.22 2006/03/24 16:38:02 jhb Exp $ + * $FreeBSD: src/bin/ls/ls.h,v 1.23 2008/04/04 03:57:46 grog Exp $ */ #define NO_PRINT 1 @@ -50,8 +50,9 @@ extern int f_sectime; /* print the real time for all files */ extern int f_size; /* list size in short listing */ extern int f_slash; /* append a '/' if the file is a directory */ -extern int f_sortacross; /* sort across rows, not down columns */ +extern int f_sortacross; /* sort across rows, not down columns */ extern int f_statustime; /* use time of last mode change */ +extern char *f_timeformat; /* user-specified time format */ extern int f_notabs; /* don't use tab-separated multi-col output */ extern int f_type; /* add type character for non-regular files */ #ifdef COLORLS ==== //depot/projects/mips2-jnpr/src/bin/ls/print.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.76 2006/10/18 10:58:27 ru Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.77 2008/04/04 03:57:46 grog Exp $"); #include #include @@ -168,7 +168,7 @@ prevdev = sp->st_dev; } np = p->fts_pointer; - (void)printf("%s %*u %-*s %-*s ", buf, dp->s_nlink, + (void)printf("%s %*u %-*s %-*s ", buf, dp->s_nlink, sp->st_nlink, dp->s_user, np->user, dp->s_group, np->group); if (f_flags) @@ -237,7 +237,7 @@ if (chcnt) putchar('\n'); } - + void printcol(const DISPLAY *dp) { @@ -378,17 +378,20 @@ now = time(NULL); #define SIXMONTHS ((365 / 2) * 86400) - if (f_sectime) + if (f_timeformat) /* user specified format */ + format = f_timeformat; + else if (f_sectime) /* mmm dd hh:mm:ss yyyy || dd mmm hh:mm:ss yyyy */ - format = d_first ? "%e %b %T %Y " : "%b %e %T %Y "; + format = d_first ? "%e %b %T %Y" : "%b %e %T %Y"; else if (ftime + SIXMONTHS > now && ftime < now + SIXMONTHS) /* mmm dd hh:mm || dd mmm hh:mm */ - format = d_first ? "%e %b %R " : "%b %e %R "; + format = d_first ? "%e %b %R" : "%b %e %R"; else /* mmm dd yyyy || dd mmm yyyy */ - format = d_first ? "%e %b %Y " : "%b %e %Y "; + format = d_first ? "%e %b %Y" : "%b %e %Y"; strftime(longstring, sizeof(longstring), format, localtime(&ftime)); fputs(longstring, stdout); + fputc(' ', stdout); } static int @@ -625,7 +628,7 @@ snprintf(name, sizeof(name), "%s", p->fts_name); else snprintf(name, sizeof(name), "%s/%s", - p->fts_parent->fts_accpath, p->fts_name); + p->fts_parent->fts_accpath, p->fts_name); /* * We have no way to tell whether a symbolic link has an ACL since * pathconf() and acl_get_file() both follow them. They also don't ==== //depot/projects/mips2-jnpr/src/bin/ls/util.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/util.c,v 1.40 2006/03/24 16:38:02 jhb Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/util.c,v 1.41 2008/04/04 05:55:42 ru Exp $"); #include #include @@ -222,9 +222,9 @@ { (void)fprintf(stderr, #ifdef COLORLS - "usage: ls [-ABCFGHILPRSTUWZabcdfghiklmnopqrstuwx1]" + "usage: ls [-ABCFGHILPRSTUWZabcdfghiklmnopqrstuwx1] [-D format]" #else - "usage: ls [-ABCFHILPRSTUWZabcdfghiklmnopqrstuwx1]" + "usage: ls [-ABCFHILPRSTUWZabcdfghiklmnopqrstuwx1] [-D format]" #endif " [file ...]\n"); exit(1); ==== //depot/projects/mips2-jnpr/src/etc/rc.d/zfs#3 (text+ko) ==== @@ -1,11 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/zfs,v 1.6 2008/03/19 14:44:55 pjd Exp $ +# $FreeBSD: src/etc/rc.d/zfs,v 1.7 2008/04/02 19:29:16 dougb Exp $ # # PROVIDE: zfs # REQUIRE: mountcritlocal -# BEFORE: mountcritremote . /etc/rc.subr ==== //depot/projects/mips2-jnpr/src/games/fortune/datfiles/fortunes#5 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.259 2008/03/31 10:28:09 ganbold Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.260 2008/04/03 10:22:56 yar Exp $ % ======================================================================= || || @@ -46075,6 +46075,12 @@ The greatest griefs are those we cause ourselves. -- Sophocles % +The greatest joy a man can know is to conquer his enemies and drive them +before him. To ride their horses and take away their possessions. To see +the faces of those who were dear to them bedewed with tears, and to clasp +their wives and daughters to his arms. + -- Chinggis (Genghis) Khan +% The greatest love is a mother's, then a dog's, then a sweetheart's. -- Polish proverb % ==== //depot/projects/mips2-jnpr/src/lib/libc/gen/err.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ static char sccsid[] = "@(#)err.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/err.c,v 1.14 2007/01/09 00:27:53 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/err.c,v 1.15 2008/04/03 20:36:44 imp Exp $"); #include "namespace.h" #include @@ -97,11 +97,7 @@ } void -verrc(eval, code, fmt, ap) - int eval; - int code; - const char *fmt; - va_list ap; +verrc(int eval, int code, const char *fmt, va_list ap) { if (err_file == 0) err_set_file((FILE *)0); @@ -126,10 +122,7 @@ } void -verrx(eval, fmt, ap) - int eval; - const char *fmt; - va_list ap; +verrx(int eval, const char *fmt, va_list ap) { if (err_file == 0) err_set_file((FILE *)0); @@ -154,9 +147,7 @@ } void -vwarn(fmt, ap) - const char *fmt; - va_list ap; +vwarn(const char *fmt, va_list ap) { vwarnc(errno, fmt, ap); } @@ -171,10 +162,7 @@ } void -vwarnc(code, fmt, ap) - int code; - const char *fmt; - va_list ap; +vwarnc(int code, const char *fmt, va_list ap) { if (err_file == 0) err_set_file((FILE *)0); @@ -196,9 +184,7 @@ } void -vwarnx(fmt, ap) - const char *fmt; - va_list ap; +vwarnx(const char *fmt, va_list ap) { if (err_file == 0) err_set_file((FILE *)0); ==== //depot/projects/mips2-jnpr/src/lib/libc/gen/msgctl.3#2 (text+ko) ==== @@ -29,9 +29,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/msgctl.3,v 1.20 2006/08/09 18:05:44 maxim Exp $ +.\" $FreeBSD: src/lib/libc/gen/msgctl.3,v 1.21 2008/04/03 16:21:43 ru Exp $ .\"/ -.Dd November 24, 1997 +.Dd April 3, 2008 .Dt MSGCTL 3 .Os .Sh NAME @@ -65,9 +65,9 @@ struct ipc_perm msg_perm; /* msg queue permission bits */ struct msg *msg_first; /* first message in the queue */ struct msg *msg_last; /* last message in the queue */ - u_long msg_cbytes; /* number of bytes in use on the queue */ - u_long msg_qnum; /* number of msgs in the queue */ - u_long msg_qbytes; /* max # of bytes on the queue */ + msglen_t msg_cbytes; /* number of bytes in use on the queue */ + msgqnum_t msg_qnum; /* number of msgs in the queue */ + msglen_t msg_qbytes; /* max # of bytes on the queue */ pid_t msg_lspid; /* pid of last msgsnd() */ pid_t msg_lrpid; /* pid of last msgrcv() */ time_t msg_stime; /* time of last msgsnd() */ @@ -89,13 +89,13 @@ and looks like this: .Bd -literal struct ipc_perm { - ushort cuid; /* creator user id */ - ushort cgid; /* creator group id */ - ushort uid; /* user id */ - ushort gid; /* group id */ - ushort mode; /* r/w permission */ - ushort seq; /* sequence # (to generate unique msg/sem/shm id) */ - key_t key; /* user specified msg/sem/shm key */ + unsigned short cuid; /* creator user id */ + unsigned short cgid; /* creator group id */ + unsigned short uid; /* user id */ + unsigned short gid; /* group id */ + unsigned short mode; /* r/w permission */ + unsigned short seq; /* sequence # (to generate unique ipcid) */ + key_t key; /* user specified msg/sem/shm key */ }; .Ed .Pp ==== //depot/projects/mips2-jnpr/src/lib/libc/include/namespace.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/include/namespace.h,v 1.22 2008/03/25 15:33:00 ru Exp $ + * $FreeBSD: src/lib/libc/include/namespace.h,v 1.23 2008/04/02 08:53:18 davidxu Exp $ */ #ifndef _NAMESPACE_H_ @@ -132,6 +132,7 @@ #define pthread_detach _pthread_detach #define pthread_equal _pthread_equal #define pthread_exit _pthread_exit +#define pthread_getaffinity_np _pthread_getaffinity_np #define pthread_getconcurrency _pthread_getconcurrency #define pthread_getcpuclockid _pthread_getcpuclockid #define pthread_getprio _pthread_getprio @@ -182,6 +183,7 @@ #define pthread_rwlockattr_setpshared _pthread_rwlockattr_setpshared #define pthread_self _pthread_self #define pthread_set_name_np _pthread_set_name_np +#define pthread_setaffinity_np _pthread_setaffinity_np #define pthread_setcancelstate _pthread_setcancelstate #define pthread_setcanceltype _pthread_setcanceltype #define pthread_setconcurrency _pthread_setconcurrency ==== //depot/projects/mips2-jnpr/src/lib/libc/include/un-namespace.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/include/un-namespace.h,v 1.19 2008/03/25 13:28:12 ru Exp $ + * $FreeBSD: src/lib/libc/include/un-namespace.h,v 1.20 2008/04/02 08:53:18 davidxu Exp $ */ #ifndef _UN_NAMESPACE_H_ @@ -113,6 +113,7 @@ #undef pthread_detach #undef pthread_equal #undef pthread_exit +#undef pthread_getaffinity_np #undef pthread_getconcurrency #undef pthread_getcpuclockid #undef pthread_getprio @@ -163,6 +164,7 @@ #undef pthread_rwlockattr_setpshared #undef pthread_self #undef pthread_set_name_np +#undef pthread_setaffinity_np #undef pthread_setcancelstate #undef pthread_setcanceltype #undef pthread_setconcurrency ==== //depot/projects/mips2-jnpr/src/lib/libc/sys/aio_cancel.2#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/aio_cancel.2,v 1.22 2003/01/13 10:37:11 tjr Exp $ +.\" $FreeBSD: src/lib/libc/sys/aio_cancel.2,v 1.23 2008/04/03 02:41:54 kevlo Exp $ .\" .Dd January 19, 2000 .Dt AIO_CANCEL 2 @@ -35,7 +35,7 @@ .Sh SYNOPSIS .In aio.h .Ft int -.Fn aio_cancel "int fildes" "struct aiocb * iocb" +.Fn aio_cancel "int fildes" "struct aiocb *iocb" .Sh DESCRIPTION The .Fn aio_cancel ==== //depot/projects/mips2-jnpr/src/lib/libc/sys/aio_suspend.2#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/aio_suspend.2,v 1.22 2004/12/23 23:45:25 keramida Exp $ +.\" $FreeBSD: src/lib/libc/sys/aio_suspend.2,v 1.23 2008/04/03 02:41:54 kevlo Exp $ .\" .Dd June 2, 1999 .Dt AIO_SUSPEND 2 @@ -35,7 +35,7 @@ .Sh SYNOPSIS .In aio.h .Ft int -.Fn aio_suspend "const struct aiocb * const iocbs[]" "int niocb" "const struct timespec * timeout" +.Fn aio_suspend "const struct aiocb *const iocbs[]" "int niocb" "const struct timespec *timeout" .Sh DESCRIPTION The .Fn aio_suspend ==== //depot/projects/mips2-jnpr/src/lib/libthr/arch/amd64/Makefile.inc#3 (text+ko) ==== @@ -1,5 +1,5 @@ -#$FreeBSD: src/lib/libthr/arch/amd64/Makefile.inc,v 1.3 2008/02/13 05:25:42 obrien Exp $ +#$FreeBSD: src/lib/libthr/arch/amd64/Makefile.inc,v 1.4 2008/04/02 07:41:23 davidxu Exp $ .PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH} -SRCS+= pthread_md.c +SRCS+= pthread_md.c _umtx_op_err.S ==== //depot/projects/mips2-jnpr/src/lib/libthr/arch/amd64/include/pthread_md.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/arch/amd64/include/pthread_md.h,v 1.4 2006/12/15 11:52:00 davidxu Exp $ + * $FreeBSD: src/lib/libthr/arch/amd64/include/pthread_md.h,v 1.5 2008/04/02 07:41:24 davidxu Exp $ */ /* @@ -97,4 +97,7 @@ { return (TCB_GET64(tcb_thread)); } + +#define HAS__UMTX_OP_ERR 1 + #endif ==== //depot/projects/mips2-jnpr/src/lib/libthr/arch/i386/Makefile.inc#3 (text+ko) ==== @@ -1,5 +1,5 @@ -# $FreeBSD: src/lib/libthr/arch/i386/Makefile.inc,v 1.3 2008/02/13 05:25:43 obrien Exp $ +# $FreeBSD: src/lib/libthr/arch/i386/Makefile.inc,v 1.4 2008/04/02 07:41:24 davidxu Exp $ .PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH} -SRCS+= pthread_md.c +SRCS+= pthread_md.c _umtx_op_err.S ==== //depot/projects/mips2-jnpr/src/lib/libthr/arch/i386/include/pthread_md.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/arch/i386/include/pthread_md.h,v 1.8 2006/12/15 11:52:00 davidxu Exp $ + * $FreeBSD: src/lib/libthr/arch/i386/include/pthread_md.h,v 1.9 2008/04/02 07:41:24 davidxu Exp $ */ /* @@ -102,4 +102,7 @@ { return (TCB_GET32(tcb_thread)); } + +#define HAS__UMTX_OP_ERR 1 + #endif ==== //depot/projects/mips2-jnpr/src/lib/libthr/thread/thr_affinity.c#3 (text+ko) ==== @@ -23,12 +23,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. * - * $FreeBSD: src/lib/libthr/thread/thr_affinity.c,v 1.2 2008/03/19 06:38:21 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_affinity.c,v 1.3 2008/04/02 11:41:12 davidxu Exp $ * */ #include "namespace.h" -#include +#include #include #include #include "un-namespace.h" ==== //depot/projects/mips2-jnpr/src/lib/libthr/thread/thr_cond.c#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/libthr/thread/thr_cond.c,v 1.24 2008/03/31 02:55:49 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_cond.c,v 1.25 2008/04/02 08:33:42 davidxu Exp $ */ #include "namespace.h" @@ -290,56 +290,3 @@ return (cond_signal_common(cond, 1)); } - -int -_pthread_cond_wait_unlocked(pthread_cond_t *cond, pthread_mutex_t *mutex, - const struct timespec *abstime) -{ - struct pthread *curthread = _get_curthread(); - struct timespec ts, ts2, *tsp; - pthread_cond_t cv; - int ret; - - cv = *cond; - THR_UMUTEX_LOCK(curthread, &cv->c_lock); - _pthread_mutex_unlock(mutex); - - if (abstime != NULL) { - clock_gettime(cv->c_clockid, &ts); - TIMESPEC_SUB(&ts2, abstime, &ts); - tsp = &ts2; - } else - tsp = NULL; - - ret = _thr_ucond_wait(&cv->c_kerncv, &cv->c_lock, tsp, 0); - if (ret == EINTR) - ret = 0; - return (ret); -} - -int -_pthread_cond_broadcast_unlock(pthread_cond_t *cond, pthread_mutex_t *mutex, int broadcast) -{ - struct pthread *curthread = _get_curthread(); - pthread_cond_t cv; - int ret = 0; - - /* - * If the condition variable is statically initialized, perform dynamic - * initialization. - */ - if (__predict_false(*cond == NULL && - (ret = init_static(curthread, cond)) != 0)) - return (ret); - - cv = *cond; - THR_UMUTEX_LOCK(curthread, &cv->c_lock); - _pthread_mutex_unlock(mutex); - if (!broadcast) - ret = _thr_ucond_signal(&cv->c_kerncv); - else - ret = _thr_ucond_broadcast(&cv->c_kerncv); - THR_UMUTEX_UNLOCK(curthread, &cv->c_lock); - return (ret); -} - ==== //depot/projects/mips2-jnpr/src/lib/libthr/thread/thr_private.h#4 (text+ko) ==== @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_private.h,v 1.87 2008/04/02 04:32:31 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_private.h,v 1.92 2008/04/03 02:47:35 davidxu Exp $ */ #ifndef _THR_PRIVATE_H @@ -460,8 +460,10 @@ (thrd)->critical_count++ #define THR_CRITICAL_LEAVE(thrd) \ - (thrd)->critical_count--; \ - _thr_ast(thrd); + do { \ + (thrd)->critical_count--; \ + _thr_ast(thrd); \ + } while (0) #define THR_UMUTEX_TRYLOCK(thrd, lck) \ _thr_umutex_trylock((lck), TID(thrd)) @@ -668,10 +670,6 @@ void _thread_bp_create(void); void _thread_bp_death(void); int _sched_yield(void); -int _pthread_getaffinity_np(pthread_t, size_t, cpuset_t *); -int _pthread_setaffinity_np(pthread_t, size_t, const cpuset_t *); -int _pthread_cond_wait_unlocked(pthread_cond_t *, pthread_mutex_t *, const struct timespec *) __hidden; -int _pthread_cond_broadcast_unlock(pthread_cond_t *, pthread_mutex_t *, int broadcast); /* #include */ #ifdef _SYS_FCNTL_H_ @@ -709,6 +707,8 @@ void __sys_exit(int); #endif +int _umtx_op_err(void *, int op, u_long, void *, void *) __hidden; + static inline int _thr_isthreaded(void) { ==== //depot/projects/mips2-jnpr/src/lib/libthr/thread/thr_rtld.c#4 (text) ==== @@ -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/libthr/thread/thr_rtld.c,v 1.6 2008/03/21 02:31:55 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_rtld.c,v 1.7 2008/04/02 07:41:24 davidxu Exp $ * */ @@ -219,7 +219,7 @@ curthread = _get_curthread(); /* force to resolve _umtx_op PLT */ - _umtx_op((struct umtx *)&dummy, UMTX_OP_WAKE, 1, 0, 0); + _umtx_op_err((struct umtx *)&dummy, UMTX_OP_WAKE, 1, 0, 0); /* force to resolve errno() PLT */ __error(); ==== //depot/projects/mips2-jnpr/src/lib/libthr/thread/thr_umtx.c#3 (text+ko) ==== @@ -23,13 +23,22 @@ * (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/libthr/thread/thr_umtx.c,v 1.14 2008/04/02 04:32:31 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_umtx.c,v 1.15 2008/04/02 07:41:24 davidxu Exp $ * */ #include "thr_private.h" #include "thr_umtx.h" +#ifndef HAS__UMTX_OP_ERR +int _umtx_op_err(void *obj, int op, u_long val, void *uaddr, void *uaddr2) +{ + if (_umtx_op(obj, op, val, uaddr, uaddr2) == -1) + return (errno); + return (0); +} +#endif + void _thr_umutex_init(struct umutex *mtx) { @@ -41,9 +50,7 @@ int __thr_umutex_lock(struct umutex *mtx) { - if (_umtx_op(mtx, UMTX_OP_MUTEX_LOCK, 0, 0, 0) != -1) - return 0; - return (errno); + return _umtx_op_err(mtx, UMTX_OP_MUTEX_LOCK, 0, 0, 0); } int @@ -53,35 +60,27 @@ if (timeout && (timeout->tv_sec < 0 || (timeout->tv_sec == 0 && timeout->tv_nsec <= 0))) return (ETIMEDOUT); - if (_umtx_op(mtx, UMTX_OP_MUTEX_LOCK, 0, 0, - __DECONST(void *, timeout)) != -1) - return (0); - return (errno); + return _umtx_op_err(mtx, UMTX_OP_MUTEX_LOCK, 0, 0, + __DECONST(void *, timeout)); } int __thr_umutex_unlock(struct umutex *mtx) { - if (_umtx_op(mtx, UMTX_OP_MUTEX_UNLOCK, 0, 0, 0) != -1) - return (0); - return (errno); + return _umtx_op_err(mtx, UMTX_OP_MUTEX_UNLOCK, 0, 0, 0); } int __thr_umutex_trylock(struct umutex *mtx) { - if (_umtx_op(mtx, UMTX_OP_MUTEX_TRYLOCK, 0, 0, 0) != -1) - return (0); - return (errno); + return _umtx_op_err(mtx, UMTX_OP_MUTEX_TRYLOCK, 0, 0, 0); } int __thr_umutex_set_ceiling(struct umutex *mtx, uint32_t ceiling, uint32_t *oldceiling) { - if (_umtx_op(mtx, UMTX_OP_SET_CEILING, ceiling, oldceiling, 0) != -1) - return (0); - return (errno); + return _umtx_op_err(mtx, UMTX_OP_SET_CEILING, ceiling, oldceiling, 0); } int @@ -90,10 +89,8 @@ if (timeout && (timeout->tv_sec < 0 || (timeout->tv_sec == 0 && timeout->tv_nsec <= 0))) return (ETIMEDOUT); - if (_umtx_op(__DEVOLATILE(void *, mtx), UMTX_OP_WAIT, id, 0, - __DECONST(void*, timeout)) != -1) - return (0); - return (errno); + return _umtx_op_err(__DEVOLATILE(void *, mtx), UMTX_OP_WAIT, id, 0, + __DECONST(void*, timeout)); } int @@ -102,19 +99,15 @@ if (timeout && (timeout->tv_sec < 0 || (timeout->tv_sec == 0 && timeout->tv_nsec <= 0))) return (ETIMEDOUT); - if (_umtx_op(__DEVOLATILE(void *, mtx), UMTX_OP_WAIT_UINT, id, 0, - __DECONST(void*, timeout)) != -1) - return (0); - return (errno); + return _umtx_op_err(__DEVOLATILE(void *, mtx), UMTX_OP_WAIT_UINT, id, 0, + __DECONST(void*, timeout)); } int _thr_umtx_wake(volatile void *mtx, int nr_wakeup) { - if (_umtx_op(__DEVOLATILE(void *, mtx), UMTX_OP_WAKE, - nr_wakeup, 0, 0) != -1) - return (0); - return (errno); + return _umtx_op_err(__DEVOLATILE(void *, mtx), UMTX_OP_WAKE, + nr_wakeup, 0, 0); } void @@ -132,12 +125,9 @@ __thr_umutex_unlock(m); return (ETIMEDOUT); } - if (_umtx_op(cv, UMTX_OP_CV_WAIT, + return _umtx_op_err(cv, UMTX_OP_CV_WAIT, check_unparking ? UMTX_CHECK_UNPARKING : 0, - m, __DECONST(void*, timeout)) != -1) { - return (0); - } - return (errno); + m, __DECONST(void*, timeout)); } int @@ -145,9 +135,7 @@ { if (!cv->c_has_waiters) return (0); - if (_umtx_op(cv, UMTX_OP_CV_SIGNAL, 0, NULL, NULL) != -1) - return (0); - return (errno); + return _umtx_op_err(cv, UMTX_OP_CV_SIGNAL, 0, NULL, NULL); } int @@ -155,31 +143,23 @@ { if (!cv->c_has_waiters) return (0); - if (_umtx_op(cv, UMTX_OP_CV_BROADCAST, 0, NULL, NULL) != -1) - return (0); - return (errno); + return _umtx_op_err(cv, UMTX_OP_CV_BROADCAST, 0, NULL, NULL); } int __thr_rwlock_rdlock(struct urwlock *rwlock, int flags, struct timespec *tsp) { - if (_umtx_op(rwlock, UMTX_OP_RW_RDLOCK, flags, NULL, tsp) != -1) - return (0); - return (errno); + return _umtx_op_err(rwlock, UMTX_OP_RW_RDLOCK, flags, NULL, tsp); } int __thr_rwlock_wrlock(struct urwlock *rwlock, struct timespec *tsp) { - if (_umtx_op(rwlock, UMTX_OP_RW_WRLOCK, 0, NULL, tsp) != -1) - return (0); - return (errno); + return _umtx_op_err(rwlock, UMTX_OP_RW_WRLOCK, 0, NULL, tsp); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Apr 4 14:36:27 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 245241065683; Fri, 4 Apr 2008 14:36:27 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D99271065680 for ; Fri, 4 Apr 2008 14:36:26 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D17118FC0C for ; Fri, 4 Apr 2008 14:36:26 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m34EaQwI048853 for ; Fri, 4 Apr 2008 14:36:26 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m34EaQtJ048851 for perforce@freebsd.org; Fri, 4 Apr 2008 14:36:26 GMT (envelope-from imp@freebsd.org) Date: Fri, 4 Apr 2008 14:36:26 GMT Message-Id: <200804041436.m34EaQtJ048851@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 139339 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Apr 2008 14:36:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=139339 Change 139339 by imp@imp_paco-paco on 2008/04/04 14:35:31 IFC @139337 Affected files ... .. //depot/projects/arm/src/lib/libc/include/libc_private.h#4 integrate .. //depot/projects/arm/src/lib/libc/sys/Makefile.inc#12 integrate .. //depot/projects/arm/src/lib/libc/sys/fcntl.c#1 branch .. //depot/projects/arm/src/sbin/ddb/ddb.8#3 integrate .. //depot/projects/arm/src/sbin/ddb/ddb.c#3 integrate .. //depot/projects/arm/src/sys/fs/fdescfs/fdesc_vnops.c#10 integrate .. //depot/projects/arm/src/sys/kern/kern_rwlock.c#16 integrate Differences ... ==== //depot/projects/arm/src/lib/libc/include/libc_private.h#4 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/include/libc_private.h,v 1.17 2007/07/04 23:27:38 peter Exp $ + * $FreeBSD: src/lib/libc/include/libc_private.h,v 1.18 2008/04/04 09:43:03 dfr Exp $ * * Private definitions for libc, libc_r and libpthread. * @@ -192,4 +192,7 @@ extern __ssize_t __sys_freebsd6_pwrite(int, const void *, __size_t, int, __off_t); extern void * __sys_freebsd6_mmap(void *, __size_t, int, int, int, int, __off_t); +/* Without back-compat translation */ +extern int __sys_fcntl(int, int, ...); + #endif /* _LIBC_PRIVATE_H_ */ ==== //depot/projects/arm/src/lib/libc/sys/Makefile.inc#12 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.3 (Berkeley) 10/24/94 -# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.132 2008/03/29 10:26:29 jeff Exp $ +# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.133 2008/04/04 09:43:03 dfr Exp $ # sys sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/sys ${.CURDIR}/sys @@ -20,7 +20,8 @@ # Sources common to both syscall interfaces: SRCS+= stack_protector.c __error.c .if !defined(WITHOUT_SYSCALL_COMPAT) -SRCS+= ftruncate.c lseek.c mmap.c pread.c pwrite.c truncate.c +SRCS+= fcntl.c ftruncate.c lseek.c mmap.c pread.c pwrite.c truncate.c +PSEUDO+= _fcntl.o .endif # Add machine dependent asm sources: ==== //depot/projects/arm/src/sbin/ddb/ddb.8#3 (text+ko) ==== @@ -23,21 +23,21 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/ddb/ddb.8,v 1.3 2008/03/05 17:51:06 brooks Exp $ +.\" $FreeBSD: src/sbin/ddb/ddb.8,v 1.4 2008/04/04 07:31:43 ru Exp $ .\" -.Dd 25 December, 2007 +.Dd April 4, 2008 .Dt DDB 8 .Os .Sh NAME .Nm ddb -.Nd Configure DDB kernel debugger properties +.Nd "configure DDB kernel debugger properties" .Sh SYNOPSIS .Nm .Cm script .Ar scriptname .Nm .Cm script -.Ar scriptname=script +.Ar scriptname Ns = Ns Ar script .Nm .Cm scripts .Nm @@ -46,9 +46,10 @@ .Nm .Ar pathname .Sh DESCRIPTION +The .Nm -configures certain aspects of the -.Xr DDB 4 +utility configures certain aspects of the +.Xr ddb 4 kernel debugger from user space that are not configured at compile-time or easily via .Xr sysctl 8 @@ -64,24 +65,26 @@ .Nm utility. Whitespace at the beginning of lines will be ignored as will lines where the -first non-whitespace character is #. +first non-whitespace character is +.Ql # . .Sh SCRIPTING +The .Nm -can be used to configure aspects of -.Xr DDB 4 +utility can be used to configure aspects of +.Xr ddb 4 scripting from user space; scripting support is described in more detail in -.Xr DDB 4 . +.Xr ddb 4 . Each of the debugger commands is available from the command line: .Bl -tag -width indent .It Cm script Ar scriptname Print the script named .Ar scriptname . -.It Cm script Ar scriptname=scriptvalue +.It Cm script Ar scriptname Ns = Ns Ar script Define a script named -.Ar scriptname ; -as many scripts contain characters interpreted in special ways by the shell, +.Ar scriptname . +As many scripts contain characters interpreted in special ways by the shell, it is advisable to enclose -.Ar scriptvalue +.Ar script in quotes. .It Cm scripts List currently defined scripts. @@ -89,6 +92,8 @@ Delete the script named .Ar scriptname . .El +.Sh EXIT STATUS +.Ex -std .Sh EXAMPLES The following example defines a script that will execute when the kernel debugger is entered as a result of a break signal: @@ -97,24 +102,22 @@ .Ed .Pp The following example will delete the script: -.Bd -literal -offset indent -ddb unscript kdb.enter.break -.Ed +.Pp +.Dl "ddb unscript kdb.enter.break" .Pp For further examples, see the .Xr ddb 4 and .Xr textdump 4 -man pages. -.Sh EXIT STATUS -.Ex -std +manual pages. .Sh SEE ALSO .Xr ddb 4 , .Xr textdump 4 , .Xr sysctl 8 .Sh HISTORY +The .Nm -first appeared in +utility first appeared in .Fx 8.0 . .Sh AUTHORS .An Robert N M Watson ==== //depot/projects/arm/src/sbin/ddb/ddb.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/ddb/ddb.c,v 1.2 2008/03/05 17:51:06 brooks Exp $"); +__FBSDID("$FreeBSD: src/sbin/ddb/ddb.c,v 1.3 2008/04/04 07:31:43 ru Exp $"); #include #include @@ -43,11 +43,11 @@ usage(void) { - fprintf(stderr, "usage:\n"); - fprintf(stderr, "ddb script scriptname\n"); - fprintf(stderr, "ddb script scriptname=script\n"); - fprintf(stderr, "ddb scripts\n"); - fprintf(stderr, "ddb unscript scriptname\n"); + fprintf(stderr, "usage: ddb script scriptname\n"); + fprintf(stderr, " ddb script scriptname=script\n"); + fprintf(stderr, " ddb scripts\n"); + fprintf(stderr, " ddb unscript scriptname\n"); + fprintf(stderr, " ddb pathname\n"); exit(EX_USAGE); } ==== //depot/projects/arm/src/sys/fs/fdescfs/fdesc_vnops.c#10 (text+ko) ==== @@ -31,7 +31,7 @@ * * @(#)fdesc_vnops.c 8.9 (Berkeley) 1/21/94 * - * $FreeBSD: src/sys/fs/fdescfs/fdesc_vnops.c,v 1.107 2008/02/26 10:10:55 kib Exp $ + * $FreeBSD: src/sys/fs/fdescfs/fdesc_vnops.c,v 1.108 2008/04/04 09:37:57 kib Exp $ */ /* @@ -116,9 +116,11 @@ loop: LIST_FOREACH(fd, fc, fd_hash) { if (fd->fd_ix == ix && fd->fd_vnode->v_mount == mp) { - if (vget(fd->fd_vnode, 0, td)) + if (vget(fd->fd_vnode, LK_EXCLUSIVE | LK_CANRECURSE, + td)) goto loop; *vpp = fd->fd_vnode; + VOP_UNLOCK(*vpp, 0); return (error); } } ==== //depot/projects/arm/src/sys/kern/kern_rwlock.c#16 (text+ko) ==== @@ -32,17 +32,19 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_rwlock.c,v 1.37 2008/04/01 20:31:55 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_rwlock.c,v 1.38 2008/04/04 10:00:46 jeff Exp $"); #include "opt_ddb.h" #include "opt_no_adaptive_rwlocks.h" #include #include +#include #include #include #include #include +#include #include #include @@ -54,6 +56,14 @@ #define ADAPTIVE_RWLOCKS #endif +#ifdef ADAPTIVE_RWLOCKS +static int rowner_retries = 10; +static int rowner_loops = 10000; +SYSCTL_NODE(_debug, OID_AUTO, rwlock, CTLFLAG_RD, NULL, "rwlock debugging"); +SYSCTL_INT(_debug_rwlock, OID_AUTO, retry, CTLFLAG_RW, &rowner_retries, 0, ""); +SYSCTL_INT(_debug_rwlock, OID_AUTO, loops, CTLFLAG_RW, &rowner_loops, 0, ""); +#endif + #ifdef DDB #include @@ -261,6 +271,8 @@ struct turnstile *ts; #ifdef ADAPTIVE_RWLOCKS volatile struct thread *owner; + int spintries = 0; + int i; #endif uint64_t waittime = 0; int contested = 0; @@ -324,6 +336,16 @@ cpu_spinwait(); continue; } + } else if (spintries < rowner_retries) { + spintries++; + for (i = 0; i < rowner_loops; i++) { + v = rw->rw_lock; + if ((v & RW_LOCK_READ) == 0 || RW_CAN_READ(v)) + break; + cpu_spinwait(); + } + if (i != rowner_loops) + continue; } #endif @@ -592,7 +614,8 @@ cpu_spinwait(); continue; } - if ((v & RW_LOCK_READ) && RW_READERS(v) && spintries < 100) { + if ((v & RW_LOCK_READ) && RW_READERS(v) && + spintries < rowner_retries) { if (!(v & RW_LOCK_WRITE_SPINNER)) { if (!atomic_cmpset_ptr(&rw->rw_lock, v, v | RW_LOCK_WRITE_SPINNER)) { @@ -601,12 +624,12 @@ } } spintries++; - for (i = 100000; i > 0; i--) { + for (i = 0; i < rowner_loops; i++) { if ((rw->rw_lock & RW_LOCK_WRITE_SPINNER) == 0) break; cpu_spinwait(); } - if (i) + if (i != rowner_loops) continue; } #endif From owner-p4-projects@FreeBSD.ORG Fri Apr 4 14:36:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 00A9F1065726; Fri, 4 Apr 2008 14:36:27 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 08D971065681 for ; Fri, 4 Apr 2008 14:36:27 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 00E308FC12 for ; Fri, 4 Apr 2008 14:36:27 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m34EaQP6048858 for ; Fri, 4 Apr 2008 14:36:26 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m34EaQDk048856 for perforce@freebsd.org; Fri, 4 Apr 2008 14:36:26 GMT (envelope-from imp@freebsd.org) Date: Fri, 4 Apr 2008 14:36:26 GMT Message-Id: <200804041436.m34EaQDk048856@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 139340 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Apr 2008 14:36:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=139340 Change 139340 by imp@imp_paco-paco on 2008/04/04 14:36:02 IFC @139337 Affected files ... .. //depot/projects/mips2/src/lib/libc/include/libc_private.h#4 integrate .. //depot/projects/mips2/src/lib/libc/sys/Makefile.inc#9 integrate .. //depot/projects/mips2/src/lib/libc/sys/fcntl.c#1 branch .. //depot/projects/mips2/src/sbin/ddb/ddb.8#3 integrate .. //depot/projects/mips2/src/sbin/ddb/ddb.c#3 integrate .. //depot/projects/mips2/src/sys/fs/fdescfs/fdesc_vnops.c#6 integrate .. //depot/projects/mips2/src/sys/kern/kern_rwlock.c#10 integrate Differences ... ==== //depot/projects/mips2/src/lib/libc/include/libc_private.h#4 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/include/libc_private.h,v 1.17 2007/07/04 23:27:38 peter Exp $ + * $FreeBSD: src/lib/libc/include/libc_private.h,v 1.18 2008/04/04 09:43:03 dfr Exp $ * * Private definitions for libc, libc_r and libpthread. * @@ -192,4 +192,7 @@ extern __ssize_t __sys_freebsd6_pwrite(int, const void *, __size_t, int, __off_t); extern void * __sys_freebsd6_mmap(void *, __size_t, int, int, int, int, __off_t); +/* Without back-compat translation */ +extern int __sys_fcntl(int, int, ...); + #endif /* _LIBC_PRIVATE_H_ */ ==== //depot/projects/mips2/src/lib/libc/sys/Makefile.inc#9 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.3 (Berkeley) 10/24/94 -# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.132 2008/03/29 10:26:29 jeff Exp $ +# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.133 2008/04/04 09:43:03 dfr Exp $ # sys sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/sys ${.CURDIR}/sys @@ -20,7 +20,8 @@ # Sources common to both syscall interfaces: SRCS+= stack_protector.c __error.c .if !defined(WITHOUT_SYSCALL_COMPAT) -SRCS+= ftruncate.c lseek.c mmap.c pread.c pwrite.c truncate.c +SRCS+= fcntl.c ftruncate.c lseek.c mmap.c pread.c pwrite.c truncate.c +PSEUDO+= _fcntl.o .endif # Add machine dependent asm sources: ==== //depot/projects/mips2/src/sbin/ddb/ddb.8#3 (text+ko) ==== @@ -23,21 +23,21 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/ddb/ddb.8,v 1.3 2008/03/05 17:51:06 brooks Exp $ +.\" $FreeBSD: src/sbin/ddb/ddb.8,v 1.4 2008/04/04 07:31:43 ru Exp $ .\" -.Dd 25 December, 2007 +.Dd April 4, 2008 .Dt DDB 8 .Os .Sh NAME .Nm ddb -.Nd Configure DDB kernel debugger properties +.Nd "configure DDB kernel debugger properties" .Sh SYNOPSIS .Nm .Cm script .Ar scriptname .Nm .Cm script -.Ar scriptname=script +.Ar scriptname Ns = Ns Ar script .Nm .Cm scripts .Nm @@ -46,9 +46,10 @@ .Nm .Ar pathname .Sh DESCRIPTION +The .Nm -configures certain aspects of the -.Xr DDB 4 +utility configures certain aspects of the +.Xr ddb 4 kernel debugger from user space that are not configured at compile-time or easily via .Xr sysctl 8 @@ -64,24 +65,26 @@ .Nm utility. Whitespace at the beginning of lines will be ignored as will lines where the -first non-whitespace character is #. +first non-whitespace character is +.Ql # . .Sh SCRIPTING +The .Nm -can be used to configure aspects of -.Xr DDB 4 +utility can be used to configure aspects of +.Xr ddb 4 scripting from user space; scripting support is described in more detail in -.Xr DDB 4 . +.Xr ddb 4 . Each of the debugger commands is available from the command line: .Bl -tag -width indent .It Cm script Ar scriptname Print the script named .Ar scriptname . -.It Cm script Ar scriptname=scriptvalue +.It Cm script Ar scriptname Ns = Ns Ar script Define a script named -.Ar scriptname ; -as many scripts contain characters interpreted in special ways by the shell, +.Ar scriptname . +As many scripts contain characters interpreted in special ways by the shell, it is advisable to enclose -.Ar scriptvalue +.Ar script in quotes. .It Cm scripts List currently defined scripts. @@ -89,6 +92,8 @@ Delete the script named .Ar scriptname . .El +.Sh EXIT STATUS +.Ex -std .Sh EXAMPLES The following example defines a script that will execute when the kernel debugger is entered as a result of a break signal: @@ -97,24 +102,22 @@ .Ed .Pp The following example will delete the script: -.Bd -literal -offset indent -ddb unscript kdb.enter.break -.Ed +.Pp +.Dl "ddb unscript kdb.enter.break" .Pp For further examples, see the .Xr ddb 4 and .Xr textdump 4 -man pages. -.Sh EXIT STATUS -.Ex -std +manual pages. .Sh SEE ALSO .Xr ddb 4 , .Xr textdump 4 , .Xr sysctl 8 .Sh HISTORY +The .Nm -first appeared in +utility first appeared in .Fx 8.0 . .Sh AUTHORS .An Robert N M Watson ==== //depot/projects/mips2/src/sbin/ddb/ddb.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/ddb/ddb.c,v 1.2 2008/03/05 17:51:06 brooks Exp $"); +__FBSDID("$FreeBSD: src/sbin/ddb/ddb.c,v 1.3 2008/04/04 07:31:43 ru Exp $"); #include #include @@ -43,11 +43,11 @@ usage(void) { - fprintf(stderr, "usage:\n"); - fprintf(stderr, "ddb script scriptname\n"); - fprintf(stderr, "ddb script scriptname=script\n"); - fprintf(stderr, "ddb scripts\n"); - fprintf(stderr, "ddb unscript scriptname\n"); + fprintf(stderr, "usage: ddb script scriptname\n"); + fprintf(stderr, " ddb script scriptname=script\n"); + fprintf(stderr, " ddb scripts\n"); + fprintf(stderr, " ddb unscript scriptname\n"); + fprintf(stderr, " ddb pathname\n"); exit(EX_USAGE); } ==== //depot/projects/mips2/src/sys/fs/fdescfs/fdesc_vnops.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ * * @(#)fdesc_vnops.c 8.9 (Berkeley) 1/21/94 * - * $FreeBSD: src/sys/fs/fdescfs/fdesc_vnops.c,v 1.107 2008/02/26 10:10:55 kib Exp $ + * $FreeBSD: src/sys/fs/fdescfs/fdesc_vnops.c,v 1.108 2008/04/04 09:37:57 kib Exp $ */ /* @@ -116,9 +116,11 @@ loop: LIST_FOREACH(fd, fc, fd_hash) { if (fd->fd_ix == ix && fd->fd_vnode->v_mount == mp) { - if (vget(fd->fd_vnode, 0, td)) + if (vget(fd->fd_vnode, LK_EXCLUSIVE | LK_CANRECURSE, + td)) goto loop; *vpp = fd->fd_vnode; + VOP_UNLOCK(*vpp, 0); return (error); } } ==== //depot/projects/mips2/src/sys/kern/kern_rwlock.c#10 (text+ko) ==== @@ -32,17 +32,19 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_rwlock.c,v 1.37 2008/04/01 20:31:55 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_rwlock.c,v 1.38 2008/04/04 10:00:46 jeff Exp $"); #include "opt_ddb.h" #include "opt_no_adaptive_rwlocks.h" #include #include +#include #include #include #include #include +#include #include #include @@ -54,6 +56,14 @@ #define ADAPTIVE_RWLOCKS #endif +#ifdef ADAPTIVE_RWLOCKS +static int rowner_retries = 10; +static int rowner_loops = 10000; +SYSCTL_NODE(_debug, OID_AUTO, rwlock, CTLFLAG_RD, NULL, "rwlock debugging"); +SYSCTL_INT(_debug_rwlock, OID_AUTO, retry, CTLFLAG_RW, &rowner_retries, 0, ""); +SYSCTL_INT(_debug_rwlock, OID_AUTO, loops, CTLFLAG_RW, &rowner_loops, 0, ""); +#endif + #ifdef DDB #include @@ -261,6 +271,8 @@ struct turnstile *ts; #ifdef ADAPTIVE_RWLOCKS volatile struct thread *owner; + int spintries = 0; + int i; #endif uint64_t waittime = 0; int contested = 0; @@ -324,6 +336,16 @@ cpu_spinwait(); continue; } + } else if (spintries < rowner_retries) { + spintries++; + for (i = 0; i < rowner_loops; i++) { + v = rw->rw_lock; + if ((v & RW_LOCK_READ) == 0 || RW_CAN_READ(v)) + break; + cpu_spinwait(); + } + if (i != rowner_loops) + continue; } #endif @@ -592,7 +614,8 @@ cpu_spinwait(); continue; } - if ((v & RW_LOCK_READ) && RW_READERS(v) && spintries < 100) { + if ((v & RW_LOCK_READ) && RW_READERS(v) && + spintries < rowner_retries) { if (!(v & RW_LOCK_WRITE_SPINNER)) { if (!atomic_cmpset_ptr(&rw->rw_lock, v, v | RW_LOCK_WRITE_SPINNER)) { @@ -601,12 +624,12 @@ } } spintries++; - for (i = 100000; i > 0; i--) { + for (i = 0; i < rowner_loops; i++) { if ((rw->rw_lock & RW_LOCK_WRITE_SPINNER) == 0) break; cpu_spinwait(); } - if (i) + if (i != rowner_loops) continue; } #endif From owner-p4-projects@FreeBSD.ORG Fri Apr 4 14:37:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 759811065670; Fri, 4 Apr 2008 14:37:28 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 37D16106566C for ; Fri, 4 Apr 2008 14:37:28 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2FA118FC0C for ; Fri, 4 Apr 2008 14:37:28 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m34EbS8x048898 for ; Fri, 4 Apr 2008 14:37:28 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m34EbREu048896 for perforce@freebsd.org; Fri, 4 Apr 2008 14:37:27 GMT (envelope-from imp@freebsd.org) Date: Fri, 4 Apr 2008 14:37:27 GMT Message-Id: <200804041437.m34EbREu048896@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 139341 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Apr 2008 14:37:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=139341 Change 139341 by imp@imp_paco-paco on 2008/04/04 14:36:39 IFC @139340 Affected files ... .. //depot/projects/mips2-jnpr/src/lib/libc/include/libc_private.h#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/sys/Makefile.inc#6 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/sys/fcntl.c#1 branch .. //depot/projects/mips2-jnpr/src/sbin/ddb/ddb.8#3 integrate .. //depot/projects/mips2-jnpr/src/sbin/ddb/ddb.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/fs/fdescfs/fdesc_vnops.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/kern_rwlock.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/tools/embed_mfs.sh#2 integrate Differences ... ==== //depot/projects/mips2-jnpr/src/lib/libc/include/libc_private.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/include/libc_private.h,v 1.17 2007/07/04 23:27:38 peter Exp $ + * $FreeBSD: src/lib/libc/include/libc_private.h,v 1.18 2008/04/04 09:43:03 dfr Exp $ * * Private definitions for libc, libc_r and libpthread. * @@ -192,4 +192,7 @@ extern __ssize_t __sys_freebsd6_pwrite(int, const void *, __size_t, int, __off_t); extern void * __sys_freebsd6_mmap(void *, __size_t, int, int, int, int, __off_t); +/* Without back-compat translation */ +extern int __sys_fcntl(int, int, ...); + #endif /* _LIBC_PRIVATE_H_ */ ==== //depot/projects/mips2-jnpr/src/lib/libc/sys/Makefile.inc#6 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.3 (Berkeley) 10/24/94 -# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.132 2008/03/29 10:26:29 jeff Exp $ +# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.133 2008/04/04 09:43:03 dfr Exp $ # sys sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/sys ${.CURDIR}/sys @@ -20,7 +20,8 @@ # Sources common to both syscall interfaces: SRCS+= stack_protector.c __error.c .if !defined(WITHOUT_SYSCALL_COMPAT) -SRCS+= ftruncate.c lseek.c mmap.c pread.c pwrite.c truncate.c +SRCS+= fcntl.c ftruncate.c lseek.c mmap.c pread.c pwrite.c truncate.c +PSEUDO+= _fcntl.o .endif # Add machine dependent asm sources: ==== //depot/projects/mips2-jnpr/src/sbin/ddb/ddb.8#3 (text+ko) ==== @@ -23,21 +23,21 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/ddb/ddb.8,v 1.3 2008/03/05 17:51:06 brooks Exp $ +.\" $FreeBSD: src/sbin/ddb/ddb.8,v 1.4 2008/04/04 07:31:43 ru Exp $ .\" -.Dd 25 December, 2007 +.Dd April 4, 2008 .Dt DDB 8 .Os .Sh NAME .Nm ddb -.Nd Configure DDB kernel debugger properties +.Nd "configure DDB kernel debugger properties" .Sh SYNOPSIS .Nm .Cm script .Ar scriptname .Nm .Cm script -.Ar scriptname=script +.Ar scriptname Ns = Ns Ar script .Nm .Cm scripts .Nm @@ -46,9 +46,10 @@ .Nm .Ar pathname .Sh DESCRIPTION +The .Nm -configures certain aspects of the -.Xr DDB 4 +utility configures certain aspects of the +.Xr ddb 4 kernel debugger from user space that are not configured at compile-time or easily via .Xr sysctl 8 @@ -64,24 +65,26 @@ .Nm utility. Whitespace at the beginning of lines will be ignored as will lines where the -first non-whitespace character is #. +first non-whitespace character is +.Ql # . .Sh SCRIPTING +The .Nm -can be used to configure aspects of -.Xr DDB 4 +utility can be used to configure aspects of +.Xr ddb 4 scripting from user space; scripting support is described in more detail in -.Xr DDB 4 . +.Xr ddb 4 . Each of the debugger commands is available from the command line: .Bl -tag -width indent .It Cm script Ar scriptname Print the script named .Ar scriptname . -.It Cm script Ar scriptname=scriptvalue +.It Cm script Ar scriptname Ns = Ns Ar script Define a script named -.Ar scriptname ; -as many scripts contain characters interpreted in special ways by the shell, +.Ar scriptname . +As many scripts contain characters interpreted in special ways by the shell, it is advisable to enclose -.Ar scriptvalue +.Ar script in quotes. .It Cm scripts List currently defined scripts. @@ -89,6 +92,8 @@ Delete the script named .Ar scriptname . .El +.Sh EXIT STATUS +.Ex -std .Sh EXAMPLES The following example defines a script that will execute when the kernel debugger is entered as a result of a break signal: @@ -97,24 +102,22 @@ .Ed .Pp The following example will delete the script: -.Bd -literal -offset indent -ddb unscript kdb.enter.break -.Ed +.Pp +.Dl "ddb unscript kdb.enter.break" .Pp For further examples, see the .Xr ddb 4 and .Xr textdump 4 -man pages. -.Sh EXIT STATUS -.Ex -std +manual pages. .Sh SEE ALSO .Xr ddb 4 , .Xr textdump 4 , .Xr sysctl 8 .Sh HISTORY +The .Nm -first appeared in +utility first appeared in .Fx 8.0 . .Sh AUTHORS .An Robert N M Watson ==== //depot/projects/mips2-jnpr/src/sbin/ddb/ddb.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/ddb/ddb.c,v 1.2 2008/03/05 17:51:06 brooks Exp $"); +__FBSDID("$FreeBSD: src/sbin/ddb/ddb.c,v 1.3 2008/04/04 07:31:43 ru Exp $"); #include #include @@ -43,11 +43,11 @@ usage(void) { - fprintf(stderr, "usage:\n"); - fprintf(stderr, "ddb script scriptname\n"); - fprintf(stderr, "ddb script scriptname=script\n"); - fprintf(stderr, "ddb scripts\n"); - fprintf(stderr, "ddb unscript scriptname\n"); + fprintf(stderr, "usage: ddb script scriptname\n"); + fprintf(stderr, " ddb script scriptname=script\n"); + fprintf(stderr, " ddb scripts\n"); + fprintf(stderr, " ddb unscript scriptname\n"); + fprintf(stderr, " ddb pathname\n"); exit(EX_USAGE); } ==== //depot/projects/mips2-jnpr/src/sys/fs/fdescfs/fdesc_vnops.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ * * @(#)fdesc_vnops.c 8.9 (Berkeley) 1/21/94 * - * $FreeBSD: src/sys/fs/fdescfs/fdesc_vnops.c,v 1.107 2008/02/26 10:10:55 kib Exp $ + * $FreeBSD: src/sys/fs/fdescfs/fdesc_vnops.c,v 1.108 2008/04/04 09:37:57 kib Exp $ */ /* @@ -116,9 +116,11 @@ loop: LIST_FOREACH(fd, fc, fd_hash) { if (fd->fd_ix == ix && fd->fd_vnode->v_mount == mp) { - if (vget(fd->fd_vnode, 0, td)) + if (vget(fd->fd_vnode, LK_EXCLUSIVE | LK_CANRECURSE, + td)) goto loop; *vpp = fd->fd_vnode; + VOP_UNLOCK(*vpp, 0); return (error); } } ==== //depot/projects/mips2-jnpr/src/sys/kern/kern_rwlock.c#4 (text+ko) ==== @@ -32,17 +32,19 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_rwlock.c,v 1.37 2008/04/01 20:31:55 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_rwlock.c,v 1.38 2008/04/04 10:00:46 jeff Exp $"); #include "opt_ddb.h" #include "opt_no_adaptive_rwlocks.h" #include #include +#include #include #include #include #include +#include #include #include @@ -54,6 +56,14 @@ #define ADAPTIVE_RWLOCKS #endif +#ifdef ADAPTIVE_RWLOCKS +static int rowner_retries = 10; +static int rowner_loops = 10000; +SYSCTL_NODE(_debug, OID_AUTO, rwlock, CTLFLAG_RD, NULL, "rwlock debugging"); +SYSCTL_INT(_debug_rwlock, OID_AUTO, retry, CTLFLAG_RW, &rowner_retries, 0, ""); +SYSCTL_INT(_debug_rwlock, OID_AUTO, loops, CTLFLAG_RW, &rowner_loops, 0, ""); +#endif + #ifdef DDB #include @@ -261,6 +271,8 @@ struct turnstile *ts; #ifdef ADAPTIVE_RWLOCKS volatile struct thread *owner; + int spintries = 0; + int i; #endif uint64_t waittime = 0; int contested = 0; @@ -324,6 +336,16 @@ cpu_spinwait(); continue; } + } else if (spintries < rowner_retries) { + spintries++; + for (i = 0; i < rowner_loops; i++) { + v = rw->rw_lock; + if ((v & RW_LOCK_READ) == 0 || RW_CAN_READ(v)) + break; + cpu_spinwait(); + } + if (i != rowner_loops) + continue; } #endif @@ -592,7 +614,8 @@ cpu_spinwait(); continue; } - if ((v & RW_LOCK_READ) && RW_READERS(v) && spintries < 100) { + if ((v & RW_LOCK_READ) && RW_READERS(v) && + spintries < rowner_retries) { if (!(v & RW_LOCK_WRITE_SPINNER)) { if (!atomic_cmpset_ptr(&rw->rw_lock, v, v | RW_LOCK_WRITE_SPINNER)) { @@ -601,12 +624,12 @@ } } spintries++; - for (i = 100000; i > 0; i--) { + for (i = 0; i < rowner_loops; i++) { if ((rw->rw_lock & RW_LOCK_WRITE_SPINNER) == 0) break; cpu_spinwait(); } - if (i) + if (i != rowner_loops) continue; } #endif ==== //depot/projects/mips2-jnpr/src/sys/tools/embed_mfs.sh#2 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Fri Apr 4 16:38:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D0DE8106566B; Fri, 4 Apr 2008 16:38:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 92D041065674 for ; Fri, 4 Apr 2008 16:38:23 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 874348FC1F for ; Fri, 4 Apr 2008 16:38:23 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m34GcNX0070876 for ; Fri, 4 Apr 2008 16:38:23 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m34GcNUs070874 for perforce@freebsd.org; Fri, 4 Apr 2008 16:38:23 GMT (envelope-from sam@freebsd.org) Date: Fri, 4 Apr 2008 16:38:23 GMT Message-Id: <200804041638.m34GcNUs070874@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 139345 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Apr 2008 16:38:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=139345 Change 139345 by sam@sam_ebb on 2008/04/04 16:38:01 hack raw xmit path to handle mgt frames; still get firmware errors negotiating wpa Affected files ... .. //depot/projects/vap/sys/dev/iwi/if_iwi.c#15 edit Differences ... ==== //depot/projects/vap/sys/dev/iwi/if_iwi.c#15 (text+ko) ==== @@ -157,6 +157,8 @@ static void iwi_write_ibssnode(struct iwi_softc *, const u_int8_t [], int); static int iwi_tx_start(struct ifnet *, struct mbuf *, struct ieee80211_node *, int); +static int iwi_raw_xmit(struct ieee80211_node *, struct mbuf *, + const struct ieee80211_bpf_params *); static void iwi_start(struct ifnet *); static void iwi_watchdog(void *); static int iwi_ioctl(struct ifnet *, u_long, caddr_t); @@ -402,6 +404,7 @@ ic->ic_node_alloc = iwi_node_alloc; sc->sc_node_free = ic->ic_node_free; ic->ic_node_free = iwi_node_free; + ic->ic_raw_xmit = iwi_raw_xmit; ic->ic_scan_start = iwi_scan_start; ic->ic_scan_end = iwi_scan_end; ic->ic_set_channel = iwi_set_channel; @@ -1872,6 +1875,49 @@ return 0; } +static int +iwi_raw_xmit(struct ieee80211_node *ni, struct mbuf *m, + const struct ieee80211_bpf_params *params) +{ + struct ieee80211com *ic = ni->ni_ic; + struct ifnet *ifp = ic->ic_ifp; + struct iwi_softc *sc = ifp->if_softc; + int ac; + IWI_LOCK_DECL; + + IWI_LOCK(sc); + + /* prevent management frames from being sent if we're not ready */ + if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) { + IWI_UNLOCK(sc); + m_freem(m); + ieee80211_free_node(ni); + return ENETDOWN; + } + ac = M_WME_GETAC(m); + if (sc->txq[ac].queued > IWI_TX_RING_COUNT - 8) { + ifp->if_drv_flags |= IFF_DRV_OACTIVE; + IWI_UNLOCK(sc); + m_freem(m); + ieee80211_free_node(ni); + return ENOBUFS; /* XXX */ + } + + BPF_MTAP(ifp, m); + + /* XXX honor params */ + if (iwi_tx_start(ifp, m, ni, ac) != 0) { + ieee80211_free_node(ni); + ifp->if_oerrors++; + IWI_UNLOCK(sc); + return EIO; + } + + IWI_UNLOCK(sc); + + return 0; +} + static void iwi_start(struct ifnet *ifp) { From owner-p4-projects@FreeBSD.ORG Fri Apr 4 17:06:55 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E00A1065671; Fri, 4 Apr 2008 17:06:55 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C38F8106566C for ; Fri, 4 Apr 2008 17:06:54 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9B39E8FC16 for ; Fri, 4 Apr 2008 17:06:54 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m34H6snx082991 for ; Fri, 4 Apr 2008 17:06:54 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m34H6sos082989 for perforce@freebsd.org; Fri, 4 Apr 2008 17:06:54 GMT (envelope-from gonzo@FreeBSD.org) Date: Fri, 4 Apr 2008 17:06:54 GMT Message-Id: <200804041706.m34H6sos082989@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 139347 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Apr 2008 17:06:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=139347 Change 139347 by gonzo@gonzo_jeeves on 2008/04/04 17:06:43 o Cleanout obsoleted files Affected files ... .. //depot/projects/mips2-jnpr/src/sys/conf/files.mips#18 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/conf/files.mips#18 (text+ko) ==== @@ -34,8 +34,6 @@ mips/mips/mp_machdep.c optional smp mips/mips/mips_subr.c standard mips/mips/psraccess.S standard -# Really? -mips/drivers/sio/ns16550.c standard # # ---------------------------------------------------------------------- # Phase 3 From owner-p4-projects@FreeBSD.ORG Fri Apr 4 18:09:01 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 001DD1065793; Fri, 4 Apr 2008 18:09:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 799E81065760 for ; Fri, 4 Apr 2008 18:09:00 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5F7178FC0C for ; Fri, 4 Apr 2008 18:09:00 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m34I90X3089295 for ; Fri, 4 Apr 2008 18:09:00 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m34I90rk089293 for perforce@freebsd.org; Fri, 4 Apr 2008 18:09:00 GMT (envelope-from imp@freebsd.org) Date: Fri, 4 Apr 2008 18:09:00 GMT Message-Id: <200804041809.m34I90rk089293@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 139352 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Apr 2008 18:09:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=139352 Change 139352 by imp@imp_paco-paco on 2008/04/04 18:08:43 IFC @139351 Affected files ... .. //depot/projects/arm/src/share/man/man9/sleep.9#6 integrate .. //depot/projects/arm/src/sys/amd64/amd64/pmap.c#41 integrate .. //depot/projects/arm/src/sys/arm/arm/elf_trampoline.c#18 integrate .. //depot/projects/arm/src/sys/conf/Makefile.arm#22 integrate Differences ... ==== //depot/projects/arm/src/share/man/man9/sleep.9#6 (text+ko) ==== @@ -23,9 +23,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/sleep.9,v 1.61 2007/03/30 18:07:26 julian Exp $ +.\" $FreeBSD: src/share/man/man9/sleep.9,v 1.62 2008/04/04 16:59:58 imp Exp $ .\" -.Dd February 27, 2007 +.Dd April 4, 2008 .Os .Dt SLEEP 9 .Sh NAME @@ -93,6 +93,10 @@ runnable with the specified .Fa priority when it resumes. +.Dv PZERO +should never be used, as it is for compatibility only. +A new priority of 0 means to use the thread's current priority when +it is made runnable again. If .Fa priority includes the ==== //depot/projects/arm/src/sys/amd64/amd64/pmap.c#41 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.611 2008/04/02 04:39:47 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.612 2008/04/04 18:00:22 alc Exp $"); /* * Manages physical address maps. @@ -2904,12 +2904,6 @@ panic("pmap_enter: attempted pmap_enter on 2MB page"); pte = pmap_pde_to_pte(pde, va); } else - pte = NULL; - - /* - * Page Directory table entry not valid, we need a new PT page - */ - if (pte == NULL) panic("pmap_enter: invalid page directory va=%#lx", va); pa = VM_PAGE_TO_PHYS(m); ==== //depot/projects/arm/src/sys/arm/arm/elf_trampoline.c#18 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.19 2008/03/22 20:34:07 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.20 2008/04/04 17:35:24 raj Exp $"); #include #include #include @@ -59,6 +59,8 @@ #define cpu_idcache_wbinv_all arm8_cache_purgeID #elif defined(CPU_ARM9) #define cpu_idcache_wbinv_all arm9_idcache_wbinv_all +#elif defined(CPU_ARM9E) +#define cpu_idcache_wbinv_all armv5_ec_idcache_wbinv_all #elif defined(CPU_ARM10) #define cpu_idcache_wbinv_all arm10_idcache_wbinv_all #elif defined(CPU_SA110) || defined(CPU_SA1110) || defined(CPU_SA1100) || \ ==== //depot/projects/arm/src/sys/conf/Makefile.arm#22 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.arm -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.arm,v 1.36 2008/04/03 20:42:36 imp Exp $ +# $FreeBSD: src/sys/conf/Makefile.arm,v 1.37 2008/04/04 17:35:24 raj Exp $ # # Makefile for FreeBSD # @@ -71,7 +71,7 @@ $S/$M/$M/cpufunc_asm_arm8.S $S/$M/$M/cpufunc_asm_arm9.S \ $S/$M/$M/cpufunc_asm_sa1.S $S/$M/$M/cpufunc_asm_arm10.S \ $S/$M/$M/cpufunc_asm_xscale.S $S/$M/$M/cpufunc_asm.S \ - $S/$M/$M/cpufunc_asm_xscale_c3.S + $S/$M/$M/cpufunc_asm_xscale_c3.S $S/$M/$M/cpufunc_asm_armv5_ec.S KERNEL_EXTRA=trampoline KERNEL_EXTRA_INSTALL=kernel.gz.tramp trampoline: ${KERNEL_KO}.tramp From owner-p4-projects@FreeBSD.ORG Fri Apr 4 18:21:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 18D1B1065670; Fri, 4 Apr 2008 18:21:14 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CF39A106566B for ; Fri, 4 Apr 2008 18:21:13 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B9A828FC26 for ; Fri, 4 Apr 2008 18:21:13 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m34ILDlk089756 for ; Fri, 4 Apr 2008 18:21:13 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m34ILDYH089754 for perforce@freebsd.org; Fri, 4 Apr 2008 18:21:13 GMT (envelope-from raj@freebsd.org) Date: Fri, 4 Apr 2008 18:21:13 GMT Message-Id: <200804041821.m34ILDYH089754@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 139353 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Apr 2008 18:21:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=139353 Change 139353 by raj@raj_mimi on 2008/04/04 18:20:19 Wipe out Warner's old Orion stuff (sorry mate :-) before importing initial support for Marvel 88F5XXX family of chips. Affected files ... .. //depot/projects/arm/src/sys/arm/orion/Orion-Port#4 delete .. //depot/projects/arm/src/sys/arm/orion/files.db88f5281#2 delete .. //depot/projects/arm/src/sys/arm/orion/files.orion#3 delete .. //depot/projects/arm/src/sys/arm/orion/orion.c#4 delete .. //depot/projects/arm/src/sys/arm/orion/orion_machdep.c#4 delete .. //depot/projects/arm/src/sys/arm/orion/orionreg.h#2 delete .. //depot/projects/arm/src/sys/arm/orion/orionvar.h#2 delete .. //depot/projects/arm/src/sys/arm/orion/std.orion#3 delete .. //depot/projects/arm/src/sys/arm/orion/uart_bus_orion.c#2 delete .. //depot/projects/arm/src/sys/arm/orion/uart_cpu_orion.c#3 delete Differences ... From owner-p4-projects@FreeBSD.ORG Fri Apr 4 18:27:20 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D2E8B1065675; Fri, 4 Apr 2008 18:27:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9443D106564A for ; Fri, 4 Apr 2008 18:27:20 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7E44D8FC21 for ; Fri, 4 Apr 2008 18:27:20 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m34IRKMf090056 for ; Fri, 4 Apr 2008 18:27:20 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m34IRKic090054 for perforce@freebsd.org; Fri, 4 Apr 2008 18:27:20 GMT (envelope-from imp@freebsd.org) Date: Fri, 4 Apr 2008 18:27:20 GMT Message-Id: <200804041827.m34IRKic090054@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 139356 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Apr 2008 18:27:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=139356 Change 139356 by imp@imp_paco-paco on 2008/04/04 18:26:24 IFC @139355 Affected files ... .. //depot/projects/arm/src/sys/arm/sa11x0/assabet_machdep.c#12 integrate Differences ... ==== //depot/projects/arm/src/sys/arm/sa11x0/assabet_machdep.c#12 (text+ko) ==== @@ -47,7 +47,7 @@ #include -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.23 2008/04/03 16:44:50 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.24 2008/04/04 18:22:16 imp Exp $"); #include "opt_md.h" @@ -225,7 +225,7 @@ boothowto = RB_VERBOSE | RB_SINGLE; cninit(); set_cpufuncs(); - lastaddr = fake_reload_metadata(); + lastaddr = fake_preload_metadata(); physmem = memsize / PAGE_SIZE; pc = &__pcpu; pcpu_init(pc, 0, sizeof(struct pcpu)); From owner-p4-projects@FreeBSD.ORG Fri Apr 4 18:47:43 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 37C071065673; Fri, 4 Apr 2008 18:47:43 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D58C31065672 for ; Fri, 4 Apr 2008 18:47:42 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BD8008FC25 for ; Fri, 4 Apr 2008 18:47:42 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m34Ilgms095064 for ; Fri, 4 Apr 2008 18:47:42 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m34IlgrS095062 for perforce@freebsd.org; Fri, 4 Apr 2008 18:47:42 GMT (envelope-from raj@freebsd.org) Date: Fri, 4 Apr 2008 18:47:42 GMT Message-Id: <200804041847.m34IlgrS095062@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 139359 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Apr 2008 18:47:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=139359 Change 139359 by raj@raj_mimi on 2008/04/04 18:47:00 This is the initial support for Marvell Orion family of 88F5XXX chips. Highlights of functionality brought along with this first step (more on the way): - basic CPU support (interrupts, timers) - Ethernet: introducing mge(4) driver - EHCI USB - multi-user operation The kernel config file is DB-88F5XXX (Marvell evaluation/development board), and it was successfully tested with 88F5281 and 88FF5182 chips. Note: only little endian mode was tested. Obtained from: Marvell, Semihalf Affected files ... .. //depot/projects/arm/src/sys/arm/orion/5x/5x.c#1 add .. //depot/projects/arm/src/sys/arm/orion/5x/db88f5xxx.c#1 add .. //depot/projects/arm/src/sys/arm/orion/5x/files.db88f5xxx#1 add .. //depot/projects/arm/src/sys/arm/orion/5x/std.db88f5xxx#1 add .. //depot/projects/arm/src/sys/arm/orion/bus_space.c#1 add .. //depot/projects/arm/src/sys/arm/orion/files.orion#4 add .. //depot/projects/arm/src/sys/arm/orion/ic.c#1 add .. //depot/projects/arm/src/sys/arm/orion/obio.c#1 add .. //depot/projects/arm/src/sys/arm/orion/orion_machdep.c#5 add .. //depot/projects/arm/src/sys/arm/orion/orionreg.h#3 add .. //depot/projects/arm/src/sys/arm/orion/orionvar.h#3 add .. //depot/projects/arm/src/sys/arm/orion/std.orion#4 add .. //depot/projects/arm/src/sys/arm/orion/timer.c#1 add .. //depot/projects/arm/src/sys/dev/uart/uart_bus_mbus.c#1 add .. //depot/projects/arm/src/sys/dev/uart/uart_cpu_orion.c#1 add .. //depot/projects/arm/src/sys/dev/usb/ehci_mbus.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Fri Apr 4 18:48:44 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 632CB1065678; Fri, 4 Apr 2008 18:48:44 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 23472106564A for ; Fri, 4 Apr 2008 18:48:44 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E69DC8FC13 for ; Fri, 4 Apr 2008 18:48:43 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m34ImhLl095078 for ; Fri, 4 Apr 2008 18:48:43 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m34Imh9u095076 for perforce@freebsd.org; Fri, 4 Apr 2008 18:48:43 GMT (envelope-from raj@freebsd.org) Date: Fri, 4 Apr 2008 18:48:43 GMT Message-Id: <200804041848.m34Imh9u095076@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 139360 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Apr 2008 18:48:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=139360 Change 139360 by raj@raj_mimi on 2008/04/04 18:48:06 Orion: Marvell 1Gb Ethernet controller driver. Obtained from: Marvell, Semihalf Affected files ... .. //depot/projects/arm/src/sys/dev/mge/if_mge.c#1 add .. //depot/projects/arm/src/sys/dev/mge/if_mgevar.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Fri Apr 4 18:49:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 771BC1065673; Fri, 4 Apr 2008 18:49:45 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 392A9106566B for ; Fri, 4 Apr 2008 18:49:45 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 213D98FC16 for ; Fri, 4 Apr 2008 18:49:45 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m34Injr8095105 for ; Fri, 4 Apr 2008 18:49:45 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m34InjXi095103 for perforce@freebsd.org; Fri, 4 Apr 2008 18:49:45 GMT (envelope-from raj@freebsd.org) Date: Fri, 4 Apr 2008 18:49:45 GMT Message-Id: <200804041849.m34InjXi095103@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 139361 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Apr 2008 18:49:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=139361 Change 139361 by raj@raj_mimi on 2008/04/04 18:49:09 EHCI workarounds for Marvell 88F5XXX integrated USB controller. Obtained from: Marvell, Semihalf Affected files ... .. //depot/projects/arm/src/sys/dev/usb/ehci.c#20 edit .. //depot/projects/arm/src/sys/dev/usb/ehcivar.h#7 edit Differences ... ==== //depot/projects/arm/src/sys/dev/usb/ehci.c#20 (text+ko) ==== @@ -338,8 +338,12 @@ for (i = 0; i < 100; i++) { usb_delay_ms(&sc->sc_bus, 1); hcr = EOREAD4(sc, EHCI_USBCMD) & EHCI_CMD_HCRESET; - if (!hcr) + if (!hcr) { + if (sc->sc_flags & EHCI_SCFLG_SETMODE) + EOWRITE4(sc, 0x68, 0x3); + return (USBD_NORMAL_COMPLETION); + } } printf("%s: reset timeout\n", device_get_nameunit(sc->sc_bus.bdev)); return (USBD_IOERROR); @@ -1976,7 +1980,18 @@ v = EOREAD4(sc, EHCI_PORTSC(index)); DPRINTFN(8,("ehci_root_ctrl_start: port status=0x%04x\n", v)); + i = UPS_HIGH_SPEED; + + if (sc->sc_flags & EHCI_SCFLG_FORCESPEED) { + if ((v & 0xc000000) == 0x8000000) + i = UPS_HIGH_SPEED; + else if ((v & 0xc000000) == 0x4000000) + i = UPS_LOW_SPEED; + else + i = 0; + } + if (v & EHCI_PS_CS) i |= UPS_CURRENT_CONNECT_STATUS; if (v & EHCI_PS_PE) i |= UPS_PORT_ENABLED; if (v & EHCI_PS_SUSP) i |= UPS_SUSPEND; @@ -2031,7 +2046,11 @@ goto ret; } /* Terminate reset sequence. */ - EOWRITE4(sc, port, v); + if (sc->sc_flags & EHCI_SCFLG_NORESTERM) + ; + else + EOWRITE4(sc, port, v); + /* Wait for HC to complete reset. */ usb_delay_ms(&sc->sc_bus, EHCI_PORT_RESET_COMPLETE); if (sc->sc_dying) { ==== //depot/projects/arm/src/sys/dev/usb/ehcivar.h#7 (text+ko) ==== @@ -96,6 +96,9 @@ #define EHCI_SCFLG_DONEINIT 0x0001 /* ehci_init() has been called. */ #define EHCI_SCFLG_LOSTINTRBUG 0x0002 /* workaround for VIA / ATI chipsets */ +#define EHCI_SCFLG_SETMODE 0x0004 /* set bridge mode again after init (Marvell) */ +#define EHCI_SCFLG_FORCESPEED 0x0008 /* force speed (Marvell) */ +#define EHCI_SCFLG_NORESTERM 0x0010 /* don't terminate reset sequence (Marvell) */ typedef struct ehci_softc { struct usbd_bus sc_bus; /* base device */ From owner-p4-projects@FreeBSD.ORG Fri Apr 4 18:50:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B97AD1065672; Fri, 4 Apr 2008 18:50:46 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7B5381065670 for ; Fri, 4 Apr 2008 18:50:46 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 49E9D8FC12 for ; Fri, 4 Apr 2008 18:50:46 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m34IokOG095168 for ; Fri, 4 Apr 2008 18:50:46 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m34IoklX095166 for perforce@freebsd.org; Fri, 4 Apr 2008 18:50:46 GMT (envelope-from raj@freebsd.org) Date: Fri, 4 Apr 2008 18:50:46 GMT Message-Id: <200804041850.m34IoklX095166@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 139362 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Apr 2008 18:50:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=139362 Change 139362 by raj@raj_mimi on 2008/04/04 18:50:03 Orion: default kernel config KERNCONF=DB-88F5XXX Affected files ... .. //depot/projects/arm/src/sys/arm/conf/DB-88F5XXX#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Fri Apr 4 18:55:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 731081065670; Fri, 4 Apr 2008 18:55:52 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 34AB31065673 for ; Fri, 4 Apr 2008 18:55:52 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 172DC8FC16 for ; Fri, 4 Apr 2008 18:55:52 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m34Itqee095331 for ; Fri, 4 Apr 2008 18:55:52 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m34Itp8k095329 for perforce@freebsd.org; Fri, 4 Apr 2008 18:55:51 GMT (envelope-from sam@freebsd.org) Date: Fri, 4 Apr 2008 18:55:51 GMT Message-Id: <200804041855.m34Itp8k095329@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 139363 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Apr 2008 18:55:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=139363 Change 139363 by sam@sam_ebb on 2008/04/04 18:54:56 o change ieee80211_vap_setup to return an errno on failure and zero on success o add a printf if unable to allocate an ifnet in ieee80211_vap_setup Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211.c#37 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211.c#37 (text+ko) ==== @@ -302,8 +302,9 @@ ifp = if_alloc(IFT_ETHER); if (ifp == NULL) { - /* XXX msg,stat? */ - return 0; + if_printf(ic->ic_ifp, "%s: unable to allocate ifnet\n", + __func__); + return ENOMEM; } if_initname(ifp, name, unit); ifp->if_softc = vap; /* back pointer */ @@ -400,7 +401,7 @@ ieee80211_scan_vattach(vap); ieee80211_regdomain_vattach(vap); - return 1; + return 0; #undef IEEE80211_C_OPMODE } From owner-p4-projects@FreeBSD.ORG Fri Apr 4 18:56:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B3D971065674; Fri, 4 Apr 2008 18:56:53 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 75903106566C for ; Fri, 4 Apr 2008 18:56:53 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4EE1C8FC17 for ; Fri, 4 Apr 2008 18:56:53 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m34Iurx9095347 for ; Fri, 4 Apr 2008 18:56:53 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m34Iurbj095345 for perforce@freebsd.org; Fri, 4 Apr 2008 18:56:53 GMT (envelope-from sam@freebsd.org) Date: Fri, 4 Apr 2008 18:56:53 GMT Message-Id: <200804041856.m34Iurbj095345@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 139364 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Apr 2008 18:56:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=139364 Change 139364 by sam@sam_ebb on 2008/04/04 18:56:14 require parent ifnet type be IFT_IEEE80211 to avoid crashing if handed a device that doesn't have the ieee8011com structure install as if_softc (to be fixed correctly shortly but worth doing regardless) Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_freebsd.c#24 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_freebsd.c#24 (text+ko) ==== @@ -45,6 +45,7 @@ #include #include #include +#include #include #include @@ -82,6 +83,10 @@ ifp = ifunit(cp.icp_parent); if (ifp == NULL) return ENXIO; + if (ifp->if_type != IFT_IEEE80211) { + if_printf(ifp, "%s: reject, not an 802.11 device\n", __func__); + return EINVAL; + } ic = ifp->if_softc; /* XXX forces ic at front of softc */ vap = ic->ic_vap_create(ic, ifc->ifc_name, unit, cp.icp_opmode, cp.icp_flags, cp.icp_bssid, From owner-p4-projects@FreeBSD.ORG Fri Apr 4 18:56:54 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6DF3A1065716; Fri, 4 Apr 2008 18:56:53 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8C0621065670 for ; Fri, 4 Apr 2008 18:56:53 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 73CEE8FC18 for ; Fri, 4 Apr 2008 18:56:53 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m34IurLW095352 for ; Fri, 4 Apr 2008 18:56:53 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m34Iurve095350 for perforce@freebsd.org; Fri, 4 Apr 2008 18:56:53 GMT (envelope-from sam@freebsd.org) Date: Fri, 4 Apr 2008 18:56:53 GMT Message-Id: <200804041856.m34Iurve095350@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 139365 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Apr 2008 18:56:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=139365 Change 139365 by sam@sam_ebb on 2008/04/04 18:56:32 handle ieee80211_vap_setup failing Affected files ... .. //depot/projects/vap/sys/dev/ath/if_ath.c#59 edit Differences ... ==== //depot/projects/vap/sys/dev/ath/if_ath.c#59 (text+ko) ==== @@ -780,7 +780,7 @@ struct ath_vap *avp; struct ieee80211vap *vap; uint8_t mac[IEEE80211_ADDR_LEN]; - int ic_opmode, needbeacon; + int ic_opmode, needbeacon, error; avp = (struct ath_vap *) malloc(sizeof(struct ath_vap), M_80211_VAP, M_WAITOK | M_ZERO); @@ -865,9 +865,14 @@ vap = &avp->av_vap; /* XXX can't hold mutex across if_alloc */ ATH_UNLOCK(sc); - /* XXX check return */ - ieee80211_vap_setup(ic, vap, name, unit, opmode, flags, bssid, mac); + error = ieee80211_vap_setup(ic, vap, name, unit, opmode, flags, + bssid, mac); ATH_LOCK(sc); + if (error != 0) { + device_printf(sc->sc_dev, "%s: error %d creating vap\n", + __func__, error); + goto bad2; + } /* h/w crypto support */ vap->iv_key_alloc = ath_key_alloc; @@ -952,6 +957,9 @@ /* complete setup */ ieee80211_vap_attach(vap, ath_media_change, ieee80211_media_status); return vap; +bad2: + reclaim_address(sc, mac); + ath_hal_setbssidmask(sc->sc_ah, sc->sc_hwbssidmask); bad: free(avp, M_80211_VAP); ATH_UNLOCK(sc); From owner-p4-projects@FreeBSD.ORG Fri Apr 4 19:16:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 52AC31065679; Fri, 4 Apr 2008 19:16:14 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 148861065674 for ; Fri, 4 Apr 2008 19:16:14 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D590C8FC19 for ; Fri, 4 Apr 2008 19:16:13 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m34JGDew097198 for ; Fri, 4 Apr 2008 19:16:13 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m34JGDi7097196 for perforce@freebsd.org; Fri, 4 Apr 2008 19:16:13 GMT (envelope-from imp@freebsd.org) Date: Fri, 4 Apr 2008 19:16:13 GMT Message-Id: <200804041916.m34JGDi7097196@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 139366 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Apr 2008 19:16:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=139366 Change 139366 by imp@imp_lighthouse on 2008/04/04 19:15:16 Force endian on little endian kernel builds too. If one were to build a toolchain with TARGET_BIG_ENDIAN set, then all little endian kernels would fail. Affected files ... .. //depot/projects/arm/src/sys/conf/Makefile.arm#23 edit Differences ... ==== //depot/projects/arm/src/sys/conf/Makefile.arm#23 (text+ko) ==== @@ -40,6 +40,10 @@ CC += -mbig-endian SYSTEM_LD += -EB LD += -EB +.else +CC += -mlittle-endian +SYSTEM_LD += -EL +LD += -EL .endif From owner-p4-projects@FreeBSD.ORG Fri Apr 4 19:26:36 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 25A56106566C; Fri, 4 Apr 2008 19:26:36 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DA5A61065675 for ; Fri, 4 Apr 2008 19:26:35 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BDBFC8FC25 for ; Fri, 4 Apr 2008 19:26:35 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m34JQUeq097609 for ; Fri, 4 Apr 2008 19:26:30 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m34JQTVP097607 for perforce@freebsd.org; Fri, 4 Apr 2008 19:26:29 GMT (envelope-from jhb@freebsd.org) Date: Fri, 4 Apr 2008 19:26:29 GMT Message-Id: <200804041926.m34JQTVP097607@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 139368 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Apr 2008 19:26:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=139368 Change 139368 by jhb@jhb_mutex on 2008/04/04 19:26:14 IFC @139358 Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#80 integrate .. //depot/projects/smpng/sys/amd64/amd64/prof_machdep.c#8 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC#62 integrate .. //depot/projects/smpng/sys/amd64/conf/NOTES#42 integrate .. //depot/projects/smpng/sys/amd64/include/clock.h#10 integrate .. //depot/projects/smpng/sys/amd64/include/param.h#18 integrate .. //depot/projects/smpng/sys/amd64/include/timerreg.h#3 integrate .. //depot/projects/smpng/sys/amd64/isa/clock.c#25 integrate .. //depot/projects/smpng/sys/arm/arm/bus_space_generic.c#1 branch .. //depot/projects/smpng/sys/arm/arm/elf_trampoline.c#16 integrate .. //depot/projects/smpng/sys/arm/arm/machdep.c#24 integrate .. //depot/projects/smpng/sys/arm/at91/kb920x_machdep.c#17 integrate .. //depot/projects/smpng/sys/arm/conf/AVILA#6 integrate .. //depot/projects/smpng/sys/arm/conf/BWCT#3 integrate .. //depot/projects/smpng/sys/arm/conf/CRB#2 integrate .. //depot/projects/smpng/sys/arm/conf/EP80219#6 integrate .. //depot/projects/smpng/sys/arm/conf/HL200#2 integrate .. //depot/projects/smpng/sys/arm/conf/IQ31244#15 integrate .. //depot/projects/smpng/sys/arm/conf/KB920X#8 integrate .. //depot/projects/smpng/sys/arm/conf/SIMICS#13 integrate .. //depot/projects/smpng/sys/arm/conf/SKYEYE#6 integrate .. //depot/projects/smpng/sys/arm/include/machdep.h#3 integrate .. //depot/projects/smpng/sys/arm/include/param.h#10 integrate .. //depot/projects/smpng/sys/arm/sa11x0/assabet_machdep.c#16 integrate .. //depot/projects/smpng/sys/arm/sa11x0/files.sa11x0#3 integrate .. //depot/projects/smpng/sys/arm/sa11x0/sa11x0_io.c#9 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/ep80219_machdep.c#7 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/files.ep80219#2 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/files.i80219#2 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/files.i80321#4 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/files.iq31244#3 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/iq31244_machdep.c#26 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/obio_space.c#5 integrate .. //depot/projects/smpng/sys/arm/xscale/i8134x/crb_machdep.c#3 integrate .. //depot/projects/smpng/sys/arm/xscale/i8134x/obio_space.c#2 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/avila_machdep.c#5 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/files.avila#2 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/files.ixp425#3 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_a4x_space.c#2 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_space.c#2 integrate .. //depot/projects/smpng/sys/boot/forth/loader.conf#50 integrate .. //depot/projects/smpng/sys/boot/i386/cdboot/cdboot.s#8 integrate .. //depot/projects/smpng/sys/boot/pc98/cdboot/cdboot.s#4 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/kern/opensolaris_kstat.c#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/kern/opensolaris_string.c#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/kern/opensolaris_zone.c#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/machine/endian.h#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/rpc/xdr.h#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/acl.h#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/atomic.h#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/bitmap.h#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/byteorder.h#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/callb.h#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/cmn_err.h#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/cpupart.h#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/cpuvar.h#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/cred.h#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/cyclic.h#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/debug.h#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/dirent.h#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/dkio.h#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/dnlc.h#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/elf.h#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/kcondvar.h#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/kmem.h#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/kobj.h#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/kstat.h#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/lock.h#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/misc.h#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/mman.h#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/mntent.h#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/mnttab.h#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/modctl.h#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/mount.h#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/mutex.h#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/objfs.h#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/param.h#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/pcpu.h#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/policy.h#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/proc.h#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/random.h#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/rwlock.h#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/sdt.h#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/stat.h#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/string.h#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/sunddi.h#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/sysmacros.h#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/systm.h#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/taskq.h#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/taskq_impl.h#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/time.h#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/types.h#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/uio.h#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/varargs.h#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/vfs.h#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/vnode.h#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/zone.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/atomic/i386/atomic.S#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/atomic/ia64/atomic.S#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/avl/avl.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/Makefile.files#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bplist.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/gzip.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sha256.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/unique.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/os/callb.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/os/list.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/os/taskq.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_array.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_mem.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/asm_linkage.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/avl_impl.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/bitmap.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/byteorder.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/callb.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/ccompile.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/compress.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/cred.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/dkio.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/dklabel.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/errorq.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/feature_tests.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/fm/protocol.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/fm/util.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/gfs.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/list.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/list_impl.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/note.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair_impl.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/processor.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/procset.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/sdt.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/synch.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/vmem.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/zmod.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/zmod/adler32.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/zmod/deflate.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/zmod/deflate.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/zmod/inffast.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/zmod/inffast.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/zmod/inffixed.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/zmod/inflate.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/zmod/inflate.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/zmod/inftrees.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/zmod/inftrees.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/zmod/trees.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/zmod/zconf.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/zmod/zlib.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod_subr.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/zmod/zutil.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/zmod/zutil.h#1 branch .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#47 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#41 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#41 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#41 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#41 integrate .. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#45 integrate .. //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#63 integrate .. //depot/projects/smpng/sys/compat/linux/linux_file.c#39 integrate .. //depot/projects/smpng/sys/compat/linux/linux_misc.c#87 integrate .. //depot/projects/smpng/sys/compat/linux/linux_uid16.c#25 integrate .. //depot/projects/smpng/sys/compat/linux/linux_util.c#18 integrate .. //depot/projects/smpng/sys/compat/opensolaris/kern/opensolaris_atomic.c#2 delete .. //depot/projects/smpng/sys/compat/opensolaris/kern/opensolaris_kmem.c#3 delete .. //depot/projects/smpng/sys/compat/opensolaris/kern/opensolaris_kobj.c#5 delete .. //depot/projects/smpng/sys/compat/opensolaris/kern/opensolaris_kstat.c#3 delete .. //depot/projects/smpng/sys/compat/opensolaris/kern/opensolaris_misc.c#3 delete .. //depot/projects/smpng/sys/compat/opensolaris/kern/opensolaris_policy.c#3 delete .. //depot/projects/smpng/sys/compat/opensolaris/kern/opensolaris_string.c#2 delete .. //depot/projects/smpng/sys/compat/opensolaris/kern/opensolaris_vfs.c#6 delete .. //depot/projects/smpng/sys/compat/opensolaris/kern/opensolaris_zone.c#2 delete .. //depot/projects/smpng/sys/compat/opensolaris/machine/endian.h#2 delete .. //depot/projects/smpng/sys/compat/opensolaris/rpc/xdr.h#3 delete .. //depot/projects/smpng/sys/compat/opensolaris/sys/acl.h#2 delete .. //depot/projects/smpng/sys/compat/opensolaris/sys/atomic.h#2 delete .. //depot/projects/smpng/sys/compat/opensolaris/sys/bitmap.h#2 delete .. //depot/projects/smpng/sys/compat/opensolaris/sys/byteorder.h#2 delete .. //depot/projects/smpng/sys/compat/opensolaris/sys/callb.h#2 delete .. //depot/projects/smpng/sys/compat/opensolaris/sys/cmn_err.h#2 delete .. //depot/projects/smpng/sys/compat/opensolaris/sys/cpupart.h#2 delete .. //depot/projects/smpng/sys/compat/opensolaris/sys/cpuvar.h#2 delete .. //depot/projects/smpng/sys/compat/opensolaris/sys/cred.h#2 delete .. //depot/projects/smpng/sys/compat/opensolaris/sys/cyclic.h#2 delete .. //depot/projects/smpng/sys/compat/opensolaris/sys/debug.h#2 delete .. //depot/projects/smpng/sys/compat/opensolaris/sys/dirent.h#2 delete .. //depot/projects/smpng/sys/compat/opensolaris/sys/dkio.h#2 delete .. //depot/projects/smpng/sys/compat/opensolaris/sys/dnlc.h#2 delete .. //depot/projects/smpng/sys/compat/opensolaris/sys/elf.h#2 delete .. //depot/projects/smpng/sys/compat/opensolaris/sys/kcondvar.h#3 delete .. //depot/projects/smpng/sys/compat/opensolaris/sys/kmem.h#4 delete .. //depot/projects/smpng/sys/compat/opensolaris/sys/kobj.h#2 delete .. //depot/projects/smpng/sys/compat/opensolaris/sys/kstat.h#2 delete .. //depot/projects/smpng/sys/compat/opensolaris/sys/lock.h#2 delete .. //depot/projects/smpng/sys/compat/opensolaris/sys/misc.h#3 delete .. //depot/projects/smpng/sys/compat/opensolaris/sys/mman.h#2 delete .. //depot/projects/smpng/sys/compat/opensolaris/sys/mntent.h#2 delete .. //depot/projects/smpng/sys/compat/opensolaris/sys/mnttab.h#2 delete .. //depot/projects/smpng/sys/compat/opensolaris/sys/modctl.h#2 delete .. //depot/projects/smpng/sys/compat/opensolaris/sys/mount.h#2 delete .. //depot/projects/smpng/sys/compat/opensolaris/sys/mutex.h#3 delete .. //depot/projects/smpng/sys/compat/opensolaris/sys/objfs.h#2 delete .. //depot/projects/smpng/sys/compat/opensolaris/sys/param.h#2 delete .. //depot/projects/smpng/sys/compat/opensolaris/sys/pcpu.h#2 delete .. //depot/projects/smpng/sys/compat/opensolaris/sys/policy.h#2 delete .. //depot/projects/smpng/sys/compat/opensolaris/sys/proc.h#3 delete .. //depot/projects/smpng/sys/compat/opensolaris/sys/random.h#2 delete .. //depot/projects/smpng/sys/compat/opensolaris/sys/rwlock.h#3 delete .. //depot/projects/smpng/sys/compat/opensolaris/sys/sdt.h#2 delete .. //depot/projects/smpng/sys/compat/opensolaris/sys/stat.h#2 delete .. //depot/projects/smpng/sys/compat/opensolaris/sys/string.h#2 delete .. //depot/projects/smpng/sys/compat/opensolaris/sys/sunddi.h#2 delete .. //depot/projects/smpng/sys/compat/opensolaris/sys/sysmacros.h#2 delete .. //depot/projects/smpng/sys/compat/opensolaris/sys/systm.h#2 delete .. //depot/projects/smpng/sys/compat/opensolaris/sys/taskq.h#2 delete .. //depot/projects/smpng/sys/compat/opensolaris/sys/taskq_impl.h#2 delete .. //depot/projects/smpng/sys/compat/opensolaris/sys/time.h#3 delete .. //depot/projects/smpng/sys/compat/opensolaris/sys/types.h#4 delete .. //depot/projects/smpng/sys/compat/opensolaris/sys/uio.h#2 delete .. //depot/projects/smpng/sys/compat/opensolaris/sys/varargs.h#2 delete .. //depot/projects/smpng/sys/compat/opensolaris/sys/vfs.h#3 delete .. //depot/projects/smpng/sys/compat/opensolaris/sys/vnode.h#5 delete .. //depot/projects/smpng/sys/compat/opensolaris/sys/zone.h#2 delete .. //depot/projects/smpng/sys/compat/pecoff/imgact_pecoff.c#29 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_fcntl.c#27 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_sysvec.c#24 integrate .. //depot/projects/smpng/sys/conf/Makefile.arm#29 integrate .. //depot/projects/smpng/sys/conf/NOTES#149 integrate .. //depot/projects/smpng/sys/conf/files#214 integrate .. //depot/projects/smpng/sys/conf/options#148 integrate .. //depot/projects/smpng/sys/conf/options.amd64#22 integrate .. //depot/projects/smpng/sys/conf/options.i386#60 integrate .. //depot/projects/smpng/sys/conf/options.pc98#59 integrate .. //depot/projects/smpng/sys/contrib/opensolaris/OPENSOLARIS.LICENSE#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/common/acl/acl_common.c#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/common/acl/acl_common.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#4 delete .. //depot/projects/smpng/sys/contrib/opensolaris/common/atomic/i386/atomic.S#4 delete .. //depot/projects/smpng/sys/contrib/opensolaris/common/atomic/ia64/atomic.S#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/common/avl/avl.c#3 delete .. //depot/projects/smpng/sys/contrib/opensolaris/common/nvpair/nvpair.c#3 delete .. //depot/projects/smpng/sys/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/common/zfs/zfs_namecheck.c#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/common/zfs/zfs_namecheck.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/common/zfs/zfs_prop.c#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/common/zfs/zfs_prop.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/Makefile.files#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/gfs.c#5 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#5 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/bplist.c#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#4 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/dmu.c#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#3 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/dnode.c#3 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#3 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#3 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#3 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/gzip.c#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/refcount.c#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sha256.c#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#3 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#3 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/space_map.c#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#3 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#3 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#3 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#3 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/txg.c#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/unique.c#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#4 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#3 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#6 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#3 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#3 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c#3 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#3 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#3 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#6 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#3 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#3 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#4 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#3 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#4 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#6 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#9 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#8 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#4 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#5 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#4 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/os/callb.c#3 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/os/list.c#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/os/taskq.c#3 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/rpc/xdr.c#3 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/rpc/xdr.h#3 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/rpc/xdr_array.c#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/rpc/xdr_mem.c#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/asm_linkage.h#3 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/avl.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/avl_impl.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/bitmap.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/byteorder.h#3 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/callb.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/ccompile.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/compress.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/cred.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/debug.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/dkio.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/dklabel.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/errorq.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/feature_tests.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/fm/protocol.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/fm/util.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/fs/zfs.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/gfs.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#3 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/list.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/list_impl.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/note.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/nvpair.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/nvpair_impl.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/processor.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/procset.h#3 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/sdt.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/synch.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/sysevent.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#3 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/vmem.h#3 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/sys/zmod.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/adler32.c#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/crc32.c#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/crc32.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/deflate.c#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/deflate.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/inffast.c#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/inffast.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/inffixed.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/inflate.c#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/inflate.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/inftrees.c#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/inftrees.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/trees.c#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/zconf.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/zlib.h#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/zmod.c#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/zmod_subr.c#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/zutil.c#2 delete .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/zmod/zutil.h#2 delete .. //depot/projects/smpng/sys/contrib/pf/net/pf_if.c#9 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf_ioctl.c#23 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pfvar.h#12 integrate .. //depot/projects/smpng/sys/ddb/db_command.c#40 integrate .. //depot/projects/smpng/sys/ddb/db_ps.c#40 integrate .. //depot/projects/smpng/sys/ddb/ddb.h#25 integrate .. //depot/projects/smpng/sys/dev/aac/aac.c#61 integrate .. //depot/projects/smpng/sys/dev/aac/aac_disk.c#25 integrate .. //depot/projects/smpng/sys/dev/aac/aacreg.h#19 integrate .. //depot/projects/smpng/sys/dev/aac/aacvar.h#29 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_adapter.h#7 integrate .. //depot/projects/smpng/sys/dev/cxgb/sys/cxgb_support.c#4 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#5 integrate .. //depot/projects/smpng/sys/dev/em/e1000_80003es2lan.c#5 integrate .. //depot/projects/smpng/sys/dev/em/e1000_82540.c#5 integrate .. //depot/projects/smpng/sys/dev/em/e1000_82541.c#5 integrate .. //depot/projects/smpng/sys/dev/em/e1000_82542.c#5 integrate .. //depot/projects/smpng/sys/dev/em/e1000_82543.c#5 integrate .. //depot/projects/smpng/sys/dev/em/e1000_82571.c#5 integrate .. //depot/projects/smpng/sys/dev/em/e1000_82571.h#5 integrate .. //depot/projects/smpng/sys/dev/em/e1000_api.c#5 integrate .. //depot/projects/smpng/sys/dev/em/e1000_api.h#5 integrate .. //depot/projects/smpng/sys/dev/em/e1000_defines.h#5 integrate .. //depot/projects/smpng/sys/dev/em/e1000_hw.h#5 integrate .. //depot/projects/smpng/sys/dev/em/e1000_ich8lan.c#5 integrate .. //depot/projects/smpng/sys/dev/em/e1000_ich8lan.h#5 integrate .. //depot/projects/smpng/sys/dev/em/e1000_mac.c#5 integrate .. //depot/projects/smpng/sys/dev/em/e1000_mac.h#5 integrate .. //depot/projects/smpng/sys/dev/em/e1000_manage.c#5 integrate .. //depot/projects/smpng/sys/dev/em/e1000_nvm.c#5 integrate .. //depot/projects/smpng/sys/dev/em/e1000_nvm.h#5 integrate .. //depot/projects/smpng/sys/dev/em/e1000_osdep.c#1 branch .. //depot/projects/smpng/sys/dev/em/e1000_osdep.h#5 integrate .. //depot/projects/smpng/sys/dev/em/e1000_phy.c#5 integrate .. //depot/projects/smpng/sys/dev/em/e1000_phy.h#5 integrate .. //depot/projects/smpng/sys/dev/em/if_em.c#86 integrate .. //depot/projects/smpng/sys/dev/em/if_em.h#44 integrate .. //depot/projects/smpng/sys/dev/en/midway.c#33 integrate .. //depot/projects/smpng/sys/dev/fatm/if_fatm.c#19 integrate .. //depot/projects/smpng/sys/dev/firewire/if_fwe.c#32 integrate .. //depot/projects/smpng/sys/dev/firewire/if_fwip.c#13 integrate .. //depot/projects/smpng/sys/dev/igb/e1000_mac.c#2 integrate .. //depot/projects/smpng/sys/dev/igb/e1000_osdep.c#1 branch .. //depot/projects/smpng/sys/dev/igb/if_igb.c#2 integrate .. //depot/projects/smpng/sys/dev/iscsi/initiator/isc_soc.c#3 integrate .. //depot/projects/smpng/sys/dev/malo/if_malo.c#1 branch .. //depot/projects/smpng/sys/dev/malo/if_malo.h#1 branch .. //depot/projects/smpng/sys/dev/malo/if_malo_pci.c#1 branch .. //depot/projects/smpng/sys/dev/malo/if_malohal.c#1 branch .. //depot/projects/smpng/sys/dev/malo/if_malohal.h#1 branch .. //depot/projects/smpng/sys/dev/malo/if_maloioctl.h#1 branch .. //depot/projects/smpng/sys/dev/mpt/mpt.c#25 integrate .. //depot/projects/smpng/sys/dev/mxge/if_mxge.c#22 integrate .. //depot/projects/smpng/sys/dev/re/if_re.c#60 integrate .. //depot/projects/smpng/sys/dev/speaker/spkr.c#3 integrate .. //depot/projects/smpng/sys/dev/syscons/syscons.c#63 integrate .. //depot/projects/smpng/sys/dev/ti/if_ti.c#11 integrate .. //depot/projects/smpng/sys/dev/usb/ubsa.c#21 integrate .. //depot/projects/smpng/sys/dev/usb/ucom.c#29 integrate .. //depot/projects/smpng/sys/dev/usb/ucomvar.h#10 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#111 integrate .. //depot/projects/smpng/sys/fs/coda/coda_vfsops.c#4 integrate .. //depot/projects/smpng/sys/fs/fdescfs/fdesc_vnops.c#29 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#58 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vnops.c#42 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_subr.c#19 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_vfsops.c#30 integrate .. //depot/projects/smpng/sys/fs/tmpfs/tmpfs_vnops.c#4 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_vfsops.c#35 integrate .. //depot/projects/smpng/sys/geom/geom_subr.c#52 integrate .. //depot/projects/smpng/sys/geom/part/g_part.h#5 integrate .. //depot/projects/smpng/sys/geom/part/g_part_pc98.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/ext2fs/ext2_vfsops.c#15 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC#93 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#131 integrate .. //depot/projects/smpng/sys/i386/conf/XBOX#9 integrate .. //depot/projects/smpng/sys/i386/i386/busdma_machdep.c#45 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#123 integrate .. //depot/projects/smpng/sys/i386/i386/trap.c#110 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_fcntl.c#13 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_util.c#10 integrate .. //depot/projects/smpng/sys/i386/include/clock.h#17 integrate .. //depot/projects/smpng/sys/i386/include/param.h#18 integrate .. //depot/projects/smpng/sys/i386/include/pmap.h#39 integrate .. //depot/projects/smpng/sys/i386/include/timerreg.h#3 integrate .. //depot/projects/smpng/sys/i386/include/vmparam.h#13 integrate .. //depot/projects/smpng/sys/i386/isa/clock.c#57 integrate .. //depot/projects/smpng/sys/i386/isa/prof_machdep.c#11 integrate .. //depot/projects/smpng/sys/i386/isa/vesa.c#19 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#59 integrate .. //depot/projects/smpng/sys/ia64/conf/GENERIC#60 integrate .. //depot/projects/smpng/sys/ia64/ia64/elf_machdep.c#21 integrate .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#115 integrate .. //depot/projects/smpng/sys/ia64/ia64/pmap.c#89 integrate .. //depot/projects/smpng/sys/ia64/include/clock.h#8 integrate .. //depot/projects/smpng/sys/ia64/include/md_var.h#24 integrate .. //depot/projects/smpng/sys/ia64/include/param.h#20 integrate .. //depot/projects/smpng/sys/isa/syscons_isa.c#13 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#83 integrate .. //depot/projects/smpng/sys/kern/kern_clock.c#60 integrate .. //depot/projects/smpng/sys/kern/kern_conf.c#53 integrate .. //depot/projects/smpng/sys/kern/kern_cpuset.c#3 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#113 integrate .. //depot/projects/smpng/sys/kern/kern_event.c#55 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#110 integrate .. //depot/projects/smpng/sys/kern/kern_intr.c#92 integrate .. //depot/projects/smpng/sys/kern/kern_jail.c#53 integrate .. //depot/projects/smpng/sys/kern/kern_lockf.c#23 integrate .. //depot/projects/smpng/sys/kern/kern_mbuf.c#27 integrate .. //depot/projects/smpng/sys/kern/kern_rwlock.c#21 integrate .. //depot/projects/smpng/sys/kern/kern_timeout.c#38 integrate .. //depot/projects/smpng/sys/kern/kern_umtx.c#33 integrate .. //depot/projects/smpng/sys/kern/makesyscalls.sh#25 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#86 integrate .. //depot/projects/smpng/sys/kern/subr_mchain.c#15 integrate .. //depot/projects/smpng/sys/kern/subr_sleepqueue.c#39 integrate .. //depot/projects/smpng/sys/kern/subr_taskqueue.c#35 integrate .. //depot/projects/smpng/sys/kern/syscalls.c#83 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#89 integrate .. //depot/projects/smpng/sys/kern/systrace_args.c#10 integrate .. //depot/projects/smpng/sys/kern/tty_cons.c#40 integrate .. //depot/projects/smpng/sys/kern/uipc_mbuf.c#58 integrate .. //depot/projects/smpng/sys/kern/uipc_mqueue.c#16 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#111 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#110 integrate .. //depot/projects/smpng/sys/kern/vfs_acl.c#5 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#110 integrate .. //depot/projects/smpng/sys/kern/vfs_cache.c#39 integrate .. //depot/projects/smpng/sys/kern/vfs_extattr.c#4 integrate .. //depot/projects/smpng/sys/kern/vfs_lookup.c#48 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#79 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#149 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#133 integrate .. //depot/projects/smpng/sys/kern/vfs_vnops.c#83 integrate .. //depot/projects/smpng/sys/kern/vnode_if.src#35 integrate .. //depot/projects/smpng/sys/modules/Makefile#144 integrate .. //depot/projects/smpng/sys/modules/bktr/bktr/Makefile#8 integrate .. //depot/projects/smpng/sys/modules/em/Makefile#9 integrate .. //depot/projects/smpng/sys/modules/geom/geom_part/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/geom/geom_part/geom_part_pc98/Makefile#1 branch .. //depot/projects/smpng/sys/modules/igb/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/ixgbe/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/krpc/Makefile#1 branch .. //depot/projects/smpng/sys/modules/malo/Makefile#1 branch .. //depot/projects/smpng/sys/modules/nfslockd/Makefile#1 branch .. //depot/projects/smpng/sys/modules/sound/driver/emu10kx/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/uslcom/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/wpi/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/zfs/Makefile#5 integrate .. //depot/projects/smpng/sys/net/bpf.c#75 integrate .. //depot/projects/smpng/sys/net/bpf_buffer.c#2 integrate .. //depot/projects/smpng/sys/net/bpf_zerocopy.c#2 integrate .. //depot/projects/smpng/sys/net/if.c#99 integrate .. //depot/projects/smpng/sys/net/if.h#36 integrate .. //depot/projects/smpng/sys/net/if_ef.c#24 integrate .. //depot/projects/smpng/sys/net/if_enc.c#9 integrate .. //depot/projects/smpng/sys/net/if_fddisubr.c#30 integrate .. //depot/projects/smpng/sys/net/if_iso88025subr.c#27 integrate .. //depot/projects/smpng/sys/net/if_loop.c#44 integrate .. //depot/projects/smpng/sys/net/if_media.h#22 integrate .. //depot/projects/smpng/sys/net/if_sl.c#33 integrate .. //depot/projects/smpng/sys/net/if_var.h#52 integrate .. //depot/projects/smpng/sys/net/raw_cb.c#15 integrate .. //depot/projects/smpng/sys/netatalk/aarp.c#24 integrate .. //depot/projects/smpng/sys/netatm/port.h#9 integrate .. //depot/projects/smpng/sys/netgraph/ng_base.c#54 integrate .. //depot/projects/smpng/sys/netgraph/ng_car.c#4 integrate .. //depot/projects/smpng/sys/netgraph/ng_pptpgre.c#19 integrate .. //depot/projects/smpng/sys/netgraph/ng_pptpgre.h#6 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.c#81 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.h#50 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#95 integrate .. //depot/projects/smpng/sys/netinet6/ip6_output.c#53 integrate .. //depot/projects/smpng/sys/netncp/ncp_conn.c#18 integrate .. //depot/projects/smpng/sys/netncp/ncp_sock.c#12 integrate .. //depot/projects/smpng/sys/netsmb/smb_iod.c#18 integrate .. //depot/projects/smpng/sys/netsmb/smb_rq.c#16 integrate .. //depot/projects/smpng/sys/netsmb/smb_trantcp.c#22 integrate .. //depot/projects/smpng/sys/nfs/nfs_common.c#14 integrate .. //depot/projects/smpng/sys/nfs4client/nfs4_vnops.c#27 integrate .. //depot/projects/smpng/sys/nfsclient/krpc_subr.c#15 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_lock.c#35 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_socket.c#55 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_subs.c#35 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#71 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_serv.c#57 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_srvcache.c#15 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_srvsock.c#34 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_srvsubs.c#42 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_syscalls.c#36 integrate .. //depot/projects/smpng/sys/nlm/nlm.h#1 branch .. //depot/projects/smpng/sys/nlm/nlm_prot.h#1 branch .. //depot/projects/smpng/sys/nlm/nlm_prot_clnt.c#1 branch .. //depot/projects/smpng/sys/nlm/nlm_prot_impl.c#1 branch .. //depot/projects/smpng/sys/nlm/nlm_prot_server.c#1 branch .. //depot/projects/smpng/sys/nlm/nlm_prot_svc.c#1 branch .. //depot/projects/smpng/sys/nlm/nlm_prot_xdr.c#1 branch .. //depot/projects/smpng/sys/nlm/sm_inter.h#1 branch .. //depot/projects/smpng/sys/nlm/sm_inter_xdr.c#1 branch .. //depot/projects/smpng/sys/pc98/cbus/clock.c#11 integrate .. //depot/projects/smpng/sys/pc98/cbus/syscons_cbus.c#4 integrate .. //depot/projects/smpng/sys/pc98/conf/GENERIC#74 integrate .. //depot/projects/smpng/sys/pc98/conf/NOTES#60 integrate .. //depot/projects/smpng/sys/pc98/include/clock.h#3 integrate .. //depot/projects/smpng/sys/pc98/include/timerreg.h#3 integrate .. //depot/projects/smpng/sys/pci/if_mn.c#15 integrate .. //depot/projects/smpng/sys/pci/if_rlreg.h#41 integrate .. //depot/projects/smpng/sys/powerpc/aim/clock.c#2 integrate .. //depot/projects/smpng/sys/powerpc/booke/clock.c#2 integrate .. //depot/projects/smpng/sys/powerpc/conf/GENERIC#47 integrate .. //depot/projects/smpng/sys/powerpc/include/asm.h#7 integrate .. //depot/projects/smpng/sys/powerpc/include/clock.h#6 integrate .. //depot/projects/smpng/sys/powerpc/include/param.h#14 integrate .. //depot/projects/smpng/sys/powerpc/psim/openpic_iobus.c#9 integrate .. //depot/projects/smpng/sys/rpc/auth.h#1 branch .. //depot/projects/smpng/sys/rpc/auth_none.c#1 branch .. //depot/projects/smpng/sys/rpc/auth_unix.c#1 branch .. //depot/projects/smpng/sys/rpc/authunix_prot.c#1 branch .. //depot/projects/smpng/sys/rpc/clnt.h#1 branch .. //depot/projects/smpng/sys/rpc/clnt_dg.c#1 branch .. //depot/projects/smpng/sys/rpc/clnt_rc.c#1 branch .. //depot/projects/smpng/sys/rpc/clnt_stat.h#1 branch .. //depot/projects/smpng/sys/rpc/clnt_vc.c#1 branch .. //depot/projects/smpng/sys/rpc/getnetconfig.c#1 branch .. //depot/projects/smpng/sys/rpc/inet_ntop.c#1 branch .. //depot/projects/smpng/sys/rpc/inet_pton.c#1 branch .. //depot/projects/smpng/sys/rpc/netconfig.h#1 branch .. //depot/projects/smpng/sys/rpc/nettype.h#1 branch .. //depot/projects/smpng/sys/rpc/pmap_prot.h#1 branch .. //depot/projects/smpng/sys/rpc/rpc.h#1 branch .. //depot/projects/smpng/sys/rpc/rpc_callmsg.c#1 branch .. //depot/projects/smpng/sys/rpc/rpc_com.h#1 branch .. //depot/projects/smpng/sys/rpc/rpc_generic.c#1 branch .. //depot/projects/smpng/sys/rpc/rpc_msg.h#1 branch .. //depot/projects/smpng/sys/rpc/rpc_prot.c#1 branch .. //depot/projects/smpng/sys/rpc/rpcb_clnt.c#1 branch .. //depot/projects/smpng/sys/rpc/rpcb_clnt.h#1 branch .. //depot/projects/smpng/sys/rpc/rpcb_prot.c#1 branch .. //depot/projects/smpng/sys/rpc/rpcb_prot.h#1 branch .. //depot/projects/smpng/sys/rpc/rpcclnt.c#15 integrate .. //depot/projects/smpng/sys/rpc/svc.c#1 branch .. //depot/projects/smpng/sys/rpc/svc.h#1 branch .. //depot/projects/smpng/sys/rpc/svc_auth.c#1 branch .. //depot/projects/smpng/sys/rpc/svc_auth.h#1 branch .. //depot/projects/smpng/sys/rpc/svc_auth_unix.c#1 branch .. //depot/projects/smpng/sys/rpc/svc_dg.c#1 branch .. //depot/projects/smpng/sys/rpc/svc_generic.c#1 branch .. //depot/projects/smpng/sys/rpc/svc_vc.c#1 branch .. //depot/projects/smpng/sys/rpc/types.h#2 integrate .. //depot/projects/smpng/sys/rpc/xdr.h#1 branch .. //depot/projects/smpng/sys/security/mac/mac_syscalls.c#5 integrate .. //depot/projects/smpng/sys/sparc64/conf/GENERIC#81 integrate .. //depot/projects/smpng/sys/sparc64/include/clock.h#7 integrate .. //depot/projects/smpng/sys/sparc64/include/param.h#19 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/clock.c#9 integrate .. //depot/projects/smpng/sys/sun4v/conf/GENERIC#8 integrate .. //depot/projects/smpng/sys/sun4v/include/clock.h#2 integrate .. //depot/projects/smpng/sys/sun4v/include/cpu.h#2 integrate .. //depot/projects/smpng/sys/sun4v/include/param.h#2 integrate .. //depot/projects/smpng/sys/sys/aac_ioctl.h#3 integrate .. //depot/projects/smpng/sys/sys/buf.h#51 integrate .. //depot/projects/smpng/sys/sys/callout.h#13 integrate .. //depot/projects/smpng/sys/sys/cdefs.h#36 integrate .. //depot/projects/smpng/sys/sys/cpuset.h#2 integrate .. //depot/projects/smpng/sys/sys/fcntl.h#9 integrate .. //depot/projects/smpng/sys/sys/imgact.h#15 integrate .. //depot/projects/smpng/sys/sys/lockf.h#8 integrate .. //depot/projects/smpng/sys/sys/lockmgr.h#25 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#76 integrate .. //depot/projects/smpng/sys/sys/mman.h#12 integrate .. //depot/projects/smpng/sys/sys/namei.h#19 integrate .. //depot/projects/smpng/sys/sys/param.h#124 integrate .. //depot/projects/smpng/sys/sys/rwlock.h#14 integrate .. //depot/projects/smpng/sys/sys/stat.h#20 integrate .. //depot/projects/smpng/sys/sys/syscall.h#82 integrate .. //depot/projects/smpng/sys/sys/syscall.mk#82 integrate .. //depot/projects/smpng/sys/sys/syscallsubr.h#54 integrate .. //depot/projects/smpng/sys/sys/sysproto.h#86 integrate .. //depot/projects/smpng/sys/sys/systm.h#86 integrate .. //depot/projects/smpng/sys/sys/taskqueue.h#13 integrate .. //depot/projects/smpng/sys/sys/time.h#25 integrate .. //depot/projects/smpng/sys/sys/umtx.h#22 integrate .. //depot/projects/smpng/sys/sys/vnode.h#85 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_snapshot.c#67 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#100 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vnops.c#59 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#66 integrate .. //depot/projects/smpng/sys/vm/uma.h#22 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#73 integrate .. //depot/projects/smpng/sys/vm/vm_kern.c#40 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#98 integrate .. //depot/projects/smpng/sys/xdr/xdr.c#1 branch .. //depot/projects/smpng/sys/xdr/xdr_array.c#1 branch .. //depot/projects/smpng/sys/xdr/xdr_mbuf.c#1 branch .. //depot/projects/smpng/sys/xdr/xdr_mem.c#1 branch .. //depot/projects/smpng/sys/xdr/xdr_reference.c#1 branch .. //depot/projects/smpng/sys/xdr/xdr_sizeof.c#1 branch Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#80 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.609 2008/03/23 23:04:09 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.612 2008/04/04 18:00:22 alc Exp $"); /* * Manages physical address maps. @@ -318,8 +318,6 @@ pmap_pml4e(pmap_t pmap, vm_offset_t va) { - if (!pmap) - return NULL; return (&pmap->pm_pml4[pmap_pml4e_index(va)]); } @@ -340,7 +338,7 @@ pml4_entry_t *pml4e; pml4e = pmap_pml4e(pmap, va); - if (pml4e == NULL || (*pml4e & PG_V) == 0) + if ((*pml4e & PG_V) == 0) return NULL; return (pmap_pml4e_to_pdpe(pml4e, va)); } @@ -2906,12 +2904,6 @@ panic("pmap_enter: attempted pmap_enter on 2MB page"); pte = pmap_pde_to_pte(pde, va); } else - pte = NULL; - - /* - * Page Directory table entry not valid, we need a new PT page - */ - if (pte == NULL) panic("pmap_enter: invalid page directory va=%#lx", va); pa = VM_PAGE_TO_PHYS(m); @@ -4371,6 +4363,7 @@ if (pdep != NULL && (*pdep & PG_V)) { if (*pdep & PG_PS) { pte = *pdep; + val = MINCORE_SUPER; /* Compute the physical address of the 4KB page. */ pa = ((*pdep & PG_PS_FRAME) | (addr & PDRMASK)) & PG_FRAME; @@ -4385,7 +4378,7 @@ PMAP_UNLOCK(pmap); if (pte != 0) { - val = MINCORE_INCORE; + val |= MINCORE_INCORE; if ((pte & PG_MANAGED) == 0) return val; ==== //depot/projects/smpng/sys/amd64/amd64/prof_machdep.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/prof_machdep.c,v 1.31 2007/11/29 02:01:21 bde Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/prof_machdep.c,v 1.32 2008/03/26 15:03:23 phk Exp $"); #ifdef GUPROF #if 0 @@ -258,7 +258,7 @@ delta = prev_count - count; prev_count = count; if ((int) delta <= 0) - return (delta + (timer0_max_count << CPUTIME_CLOCK_I8254_SHIFT)); + return (delta + (i8254_max_count << CPUTIME_CLOCK_I8254_SHIFT)); return (delta); } @@ -323,7 +323,7 @@ cputime_clock = CPUTIME_CLOCK_TSC; #endif } - gp->profrate = timer_freq << CPUTIME_CLOCK_I8254_SHIFT; + gp->profrate = i8254_freq << CPUTIME_CLOCK_I8254_SHIFT; #if defined(I586_CPU) || defined(I686_CPU) if (cputime_clock == CPUTIME_CLOCK_TSC) { gp->profrate = tsc_freq >> 1; ==== //depot/projects/smpng/sys/amd64/conf/GENERIC#62 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.494 2008/03/05 14:13:29 rink Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.495 2008/03/27 11:54:17 dfr Exp $ cpu HAMMER ident GENERIC @@ -39,6 +39,7 @@ options MD_ROOT # MD is a potential root device options NFSCLIENT # Network Filesystem Client options NFSSERVER # Network Filesystem Server +options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCLIENT options NTFS # NT File System options MSDOSFS # MSDOS Filesystem ==== //depot/projects/smpng/sys/amd64/conf/NOTES#42 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.75 2008/02/03 07:07:30 scottl Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.77 2008/03/26 22:11:58 phk Exp $ # # @@ -80,23 +80,14 @@ options DEVICE_POLLING +# BPF_JITTER adds support for BPF just-in-time compiler. + +options BPF_JITTER + ##################################################################### # CLOCK OPTIONS >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Apr 4 19:32:37 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6FB651065673; Fri, 4 Apr 2008 19:32:37 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 31547106566C for ; Fri, 4 Apr 2008 19:32:37 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1698B8FC22 for ; Fri, 4 Apr 2008 19:32:37 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m34JWb0S097756 for ; Fri, 4 Apr 2008 19:32:37 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m34JWaAD097754 for perforce@freebsd.org; Fri, 4 Apr 2008 19:32:36 GMT (envelope-from jhb@freebsd.org) Date: Fri, 4 Apr 2008 19:32:36 GMT Message-Id: <200804041932.m34JWaAD097754@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 139369 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Apr 2008 19:32:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=139369 Change 139369 by jhb@jhb_mutex on 2008/04/04 19:31:55 IFC @139367 Affected files ... .. //depot/projects/smpng/sys/vm/vm_map.c#90 integrate Differences ... ==== //depot/projects/smpng/sys/vm/vm_map.c#90 (text+ko) ==== @@ -63,7 +63,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_map.c,v 1.393 2008/03/12 10:12:01 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_map.c,v 1.394 2008/04/04 19:14:58 alc Exp $"); #include #include @@ -1459,8 +1459,8 @@ * * Preload read-only mappings for the given object's resident pages into * the given map. This eliminates the soft faults on process startup and - * immediately after an mmap(2). Unless the given flags include - * MAP_PREFAULT_MADVISE, cached pages are not reactivated and mapped. + * immediately after an mmap(2). Because these are speculative mappings, + * cached pages are not reactivated and mapped. */ void vm_map_pmap_enter(vm_map_t map, vm_offset_t addr, vm_prot_t prot, From owner-p4-projects@FreeBSD.ORG Fri Apr 4 20:09:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DC41B10656A9; Fri, 4 Apr 2008 20:09:17 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9ECE5106567C for ; Fri, 4 Apr 2008 20:09:17 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 81CA88FC68 for ; Fri, 4 Apr 2008 20:09:17 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m34K9H6g001172 for ; Fri, 4 Apr 2008 20:09:17 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m34K9HLW001170 for perforce@freebsd.org; Fri, 4 Apr 2008 20:09:17 GMT (envelope-from imp@freebsd.org) Date: Fri, 4 Apr 2008 20:09:17 GMT Message-Id: <200804042009.m34K9HLW001170@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 139373 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Apr 2008 20:09:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=139373 Change 139373 by imp@imp_paco-paco on 2008/04/04 20:08:56 Diff reduction with CVS Affected files ... .. //depot/projects/arm/src/sys/arm/arm/cpufunc_asm_arm11.S#3 edit .. //depot/projects/arm/src/sys/arm/arm/cpufunc_asm_armv5.S#3 edit .. //depot/projects/arm/src/sys/arm/arm/cpufunc_asm_armv5_ec.S#3 edit Differences ... ==== //depot/projects/arm/src/sys/arm/arm/cpufunc_asm_arm11.S#3 (text+ko) ==== @@ -35,6 +35,7 @@ */ #include +__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc_asm_arm11.S,v 1.1 2007/10/18 05:33:05 imp Exp $"); /* * Functions to set the MMU Translation Table Base register ==== //depot/projects/arm/src/sys/arm/arm/cpufunc_asm_armv5.S#3 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc_asm_armv5.S,v 1.1 2007/10/18 05:33:05 imp Exp $"); /* * Functions to set the MMU Translation Table Base register ==== //depot/projects/arm/src/sys/arm/arm/cpufunc_asm_armv5_ec.S#3 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc_asm_armv5_ec.S,v 1.1 2007/10/18 05:33:05 imp Exp $"); /* * Functions to set the MMU Translation Table Base register From owner-p4-projects@FreeBSD.ORG Fri Apr 4 20:43:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DFD4B106566C; Fri, 4 Apr 2008 20:43:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A2023106564A for ; Fri, 4 Apr 2008 20:43:56 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 827948FC1D for ; Fri, 4 Apr 2008 20:43:56 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m34KhuoX012369 for ; Fri, 4 Apr 2008 20:43:56 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m34KhurP012367 for perforce@freebsd.org; Fri, 4 Apr 2008 20:43:56 GMT (envelope-from imp@freebsd.org) Date: Fri, 4 Apr 2008 20:43:56 GMT Message-Id: <200804042043.m34KhurP012367@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 139375 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Apr 2008 20:43:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=139375 Change 139375 by imp@imp_paco-paco on 2008/04/04 20:42:55 IFC @139373 Affected files ... .. //depot/projects/arm/src/sys/conf/Makefile.arm#24 integrate .. //depot/projects/arm/src/sys/i386/i386/pmap.c#39 integrate .. //depot/projects/arm/src/sys/kern/kern_mbuf.c#20 integrate .. //depot/projects/arm/src/sys/vm/uma.h#6 integrate .. //depot/projects/arm/src/sys/vm/uma_core.c#16 integrate .. //depot/projects/arm/src/sys/vm/vm_map.c#21 integrate Differences ... ==== //depot/projects/arm/src/sys/conf/Makefile.arm#24 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.arm -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.arm,v 1.37 2008/04/04 17:35:24 raj Exp $ +# $FreeBSD: src/sys/conf/Makefile.arm,v 1.38 2008/04/04 19:33:09 imp Exp $ # # Makefile for FreeBSD # ==== //depot/projects/arm/src/sys/i386/i386/pmap.c#39 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.613 2008/03/29 04:29:50 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.614 2008/04/04 18:41:11 alc Exp $"); /* * Manages physical address maps. @@ -561,7 +561,9 @@ static void * pmap_pdpt_allocf(uma_zone_t zone, int bytes, u_int8_t *flags, int wait) { - *flags = UMA_SLAB_PRIV; + + /* Inform UMA that this allocator uses kernel_map/object. */ + *flags = UMA_SLAB_KERNEL; return (contigmalloc(PAGE_SIZE, M_PMAPPDPT, 0, 0x0ULL, 0xffffffffULL, 1, 0)); } ==== //depot/projects/arm/src/sys/kern/kern_mbuf.c#20 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_mbuf.c,v 1.39 2008/03/16 10:58:05 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_mbuf.c,v 1.40 2008/04/04 18:41:12 alc Exp $"); #include "opt_mac.h" #include "opt_param.h" @@ -352,7 +352,8 @@ mbuf_jumbo_alloc(uma_zone_t zone, int bytes, u_int8_t *flags, int wait) { - *flags = UMA_SLAB_PRIV; + /* Inform UMA that this allocator uses kernel_map/object. */ + *flags = UMA_SLAB_KERNEL; return (contigmalloc(bytes, M_JUMBOFRAME, wait, (vm_paddr_t)0, ~(vm_paddr_t)0, 1, 0)); } ==== //depot/projects/arm/src/sys/vm/uma.h#6 (text+ko) ==== @@ -24,7 +24,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/vm/uma.h,v 1.31 2007/02/11 20:13:52 rwatson Exp $ + * $FreeBSD: src/sys/vm/uma.h,v 1.32 2008/04/04 18:41:12 alc Exp $ * */ @@ -488,6 +488,7 @@ */ #define UMA_SLAB_BOOT 0x01 /* Slab alloced from boot pages */ #define UMA_SLAB_KMEM 0x02 /* Slab alloced from kmem_map */ +#define UMA_SLAB_KERNEL 0x04 /* Slab alloced from kernel_map */ #define UMA_SLAB_PRIV 0x08 /* Slab alloced from priv allocator */ #define UMA_SLAB_OFFP 0x10 /* Slab is managed separately */ #define UMA_SLAB_MALLOC 0x20 /* Slab is a large malloc slab */ ==== //depot/projects/arm/src/sys/vm/uma_core.c#16 (text+ko) ==== @@ -48,7 +48,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/uma_core.c,v 1.148 2007/10/11 20:11:27 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/uma_core.c,v 1.149 2008/04/04 18:41:12 alc Exp $"); /* I should really use ktr.. */ /* @@ -751,6 +751,8 @@ if (flags & UMA_SLAB_KMEM) obj = kmem_object; + else if (flags & UMA_SLAB_KERNEL) + obj = kernel_object; else obj = NULL; for (i = 0; i < keg->uk_ppera; i++) @@ -871,6 +873,8 @@ if (flags & UMA_SLAB_KMEM) obj = kmem_object; + else if (flags & UMA_SLAB_KERNEL) + obj = kernel_object; else obj = NULL; for (i = 0; i < keg->uk_ppera; i++) ==== //depot/projects/arm/src/sys/vm/vm_map.c#21 (text+ko) ==== @@ -63,7 +63,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_map.c,v 1.393 2008/03/12 10:12:01 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_map.c,v 1.394 2008/04/04 19:14:58 alc Exp $"); #include #include @@ -1459,8 +1459,8 @@ * * Preload read-only mappings for the given object's resident pages into * the given map. This eliminates the soft faults on process startup and - * immediately after an mmap(2). Unless the given flags include - * MAP_PREFAULT_MADVISE, cached pages are not reactivated and mapped. + * immediately after an mmap(2). Because these are speculative mappings, + * cached pages are not reactivated and mapped. */ void vm_map_pmap_enter(vm_map_t map, vm_offset_t addr, vm_prot_t prot, From owner-p4-projects@FreeBSD.ORG Fri Apr 4 20:44:58 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2377D1065672; Fri, 4 Apr 2008 20:44:58 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D9CEE106564A for ; Fri, 4 Apr 2008 20:44:57 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BA00D8FC19 for ; Fri, 4 Apr 2008 20:44:57 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m34KivhC012402 for ; Fri, 4 Apr 2008 20:44:57 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m34KivUI012400 for perforce@freebsd.org; Fri, 4 Apr 2008 20:44:57 GMT (envelope-from imp@freebsd.org) Date: Fri, 4 Apr 2008 20:44:57 GMT Message-Id: <200804042044.m34KivUI012400@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 139376 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Apr 2008 20:44:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=139376 Change 139376 by imp@imp_paco-paco on 2008/04/04 20:44:52 IFC @139373 Affected files ... .. //depot/projects/mips2/src/share/man/man9/sleep.9#3 integrate .. //depot/projects/mips2/src/sys/amd64/amd64/pmap.c#18 integrate .. //depot/projects/mips2/src/sys/arm/arm/elf_trampoline.c#5 integrate .. //depot/projects/mips2/src/sys/arm/sa11x0/assabet_machdep.c#5 integrate .. //depot/projects/mips2/src/sys/conf/Makefile.arm#7 integrate .. //depot/projects/mips2/src/sys/i386/i386/pmap.c#16 integrate .. //depot/projects/mips2/src/sys/kern/kern_mbuf.c#10 integrate .. //depot/projects/mips2/src/sys/vm/uma.h#3 integrate .. //depot/projects/mips2/src/sys/vm/uma_core.c#6 integrate .. //depot/projects/mips2/src/sys/vm/vm_map.c#10 integrate Differences ... ==== //depot/projects/mips2/src/share/man/man9/sleep.9#3 (text+ko) ==== @@ -23,9 +23,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/sleep.9,v 1.61 2007/03/30 18:07:26 julian Exp $ +.\" $FreeBSD: src/share/man/man9/sleep.9,v 1.62 2008/04/04 16:59:58 imp Exp $ .\" -.Dd February 27, 2007 +.Dd April 4, 2008 .Os .Dt SLEEP 9 .Sh NAME @@ -93,6 +93,10 @@ runnable with the specified .Fa priority when it resumes. +.Dv PZERO +should never be used, as it is for compatibility only. +A new priority of 0 means to use the thread's current priority when +it is made runnable again. If .Fa priority includes the ==== //depot/projects/mips2/src/sys/amd64/amd64/pmap.c#18 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.611 2008/04/02 04:39:47 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.612 2008/04/04 18:00:22 alc Exp $"); /* * Manages physical address maps. @@ -2904,12 +2904,6 @@ panic("pmap_enter: attempted pmap_enter on 2MB page"); pte = pmap_pde_to_pte(pde, va); } else - pte = NULL; - - /* - * Page Directory table entry not valid, we need a new PT page - */ - if (pte == NULL) panic("pmap_enter: invalid page directory va=%#lx", va); pa = VM_PAGE_TO_PHYS(m); ==== //depot/projects/mips2/src/sys/arm/arm/elf_trampoline.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.19 2008/03/22 20:34:07 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.20 2008/04/04 17:35:24 raj Exp $"); #include #include #include @@ -59,6 +59,8 @@ #define cpu_idcache_wbinv_all arm8_cache_purgeID #elif defined(CPU_ARM9) #define cpu_idcache_wbinv_all arm9_idcache_wbinv_all +#elif defined(CPU_ARM9E) +#define cpu_idcache_wbinv_all armv5_ec_idcache_wbinv_all #elif defined(CPU_ARM10) #define cpu_idcache_wbinv_all arm10_idcache_wbinv_all #elif defined(CPU_SA110) || defined(CPU_SA1110) || defined(CPU_SA1100) || \ ==== //depot/projects/mips2/src/sys/arm/sa11x0/assabet_machdep.c#5 (text+ko) ==== @@ -47,7 +47,7 @@ #include -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.23 2008/04/03 16:44:50 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.24 2008/04/04 18:22:16 imp Exp $"); #include "opt_md.h" @@ -225,7 +225,7 @@ boothowto = RB_VERBOSE | RB_SINGLE; cninit(); set_cpufuncs(); - lastaddr = fake_reload_metadata(); + lastaddr = fake_preload_metadata(); physmem = memsize / PAGE_SIZE; pc = &__pcpu; pcpu_init(pc, 0, sizeof(struct pcpu)); ==== //depot/projects/mips2/src/sys/conf/Makefile.arm#7 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.arm -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.arm,v 1.36 2008/04/03 20:42:36 imp Exp $ +# $FreeBSD: src/sys/conf/Makefile.arm,v 1.38 2008/04/04 19:33:09 imp Exp $ # # Makefile for FreeBSD # @@ -40,6 +40,10 @@ CC += -mbig-endian SYSTEM_LD += -EB LD += -EB +.else +CC += -mlittle-endian +SYSTEM_LD += -EL +LD += -EL .endif @@ -71,7 +75,7 @@ $S/$M/$M/cpufunc_asm_arm8.S $S/$M/$M/cpufunc_asm_arm9.S \ $S/$M/$M/cpufunc_asm_sa1.S $S/$M/$M/cpufunc_asm_arm10.S \ $S/$M/$M/cpufunc_asm_xscale.S $S/$M/$M/cpufunc_asm.S \ - $S/$M/$M/cpufunc_asm_xscale_c3.S + $S/$M/$M/cpufunc_asm_xscale_c3.S $S/$M/$M/cpufunc_asm_armv5_ec.S KERNEL_EXTRA=trampoline KERNEL_EXTRA_INSTALL=kernel.gz.tramp trampoline: ${KERNEL_KO}.tramp ==== //depot/projects/mips2/src/sys/i386/i386/pmap.c#16 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.613 2008/03/29 04:29:50 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.614 2008/04/04 18:41:11 alc Exp $"); /* * Manages physical address maps. @@ -561,7 +561,9 @@ static void * pmap_pdpt_allocf(uma_zone_t zone, int bytes, u_int8_t *flags, int wait) { - *flags = UMA_SLAB_PRIV; + + /* Inform UMA that this allocator uses kernel_map/object. */ + *flags = UMA_SLAB_KERNEL; return (contigmalloc(PAGE_SIZE, M_PMAPPDPT, 0, 0x0ULL, 0xffffffffULL, 1, 0)); } ==== //depot/projects/mips2/src/sys/kern/kern_mbuf.c#10 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_mbuf.c,v 1.39 2008/03/16 10:58:05 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_mbuf.c,v 1.40 2008/04/04 18:41:12 alc Exp $"); #include "opt_mac.h" #include "opt_param.h" @@ -352,7 +352,8 @@ mbuf_jumbo_alloc(uma_zone_t zone, int bytes, u_int8_t *flags, int wait) { - *flags = UMA_SLAB_PRIV; + /* Inform UMA that this allocator uses kernel_map/object. */ + *flags = UMA_SLAB_KERNEL; return (contigmalloc(bytes, M_JUMBOFRAME, wait, (vm_paddr_t)0, ~(vm_paddr_t)0, 1, 0)); } ==== //depot/projects/mips2/src/sys/vm/uma.h#3 (text+ko) ==== @@ -24,7 +24,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/vm/uma.h,v 1.31 2007/02/11 20:13:52 rwatson Exp $ + * $FreeBSD: src/sys/vm/uma.h,v 1.32 2008/04/04 18:41:12 alc Exp $ * */ @@ -488,6 +488,7 @@ */ #define UMA_SLAB_BOOT 0x01 /* Slab alloced from boot pages */ #define UMA_SLAB_KMEM 0x02 /* Slab alloced from kmem_map */ +#define UMA_SLAB_KERNEL 0x04 /* Slab alloced from kernel_map */ #define UMA_SLAB_PRIV 0x08 /* Slab alloced from priv allocator */ #define UMA_SLAB_OFFP 0x10 /* Slab is managed separately */ #define UMA_SLAB_MALLOC 0x20 /* Slab is a large malloc slab */ ==== //depot/projects/mips2/src/sys/vm/uma_core.c#6 (text+ko) ==== @@ -48,7 +48,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/uma_core.c,v 1.148 2007/10/11 20:11:27 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/uma_core.c,v 1.149 2008/04/04 18:41:12 alc Exp $"); /* I should really use ktr.. */ /* @@ -751,6 +751,8 @@ if (flags & UMA_SLAB_KMEM) obj = kmem_object; + else if (flags & UMA_SLAB_KERNEL) + obj = kernel_object; else obj = NULL; for (i = 0; i < keg->uk_ppera; i++) @@ -871,6 +873,8 @@ if (flags & UMA_SLAB_KMEM) obj = kmem_object; + else if (flags & UMA_SLAB_KERNEL) + obj = kernel_object; else obj = NULL; for (i = 0; i < keg->uk_ppera; i++) ==== //depot/projects/mips2/src/sys/vm/vm_map.c#10 (text+ko) ==== @@ -63,7 +63,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_map.c,v 1.393 2008/03/12 10:12:01 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_map.c,v 1.394 2008/04/04 19:14:58 alc Exp $"); #include #include @@ -1459,8 +1459,8 @@ * * Preload read-only mappings for the given object's resident pages into * the given map. This eliminates the soft faults on process startup and - * immediately after an mmap(2). Unless the given flags include - * MAP_PREFAULT_MADVISE, cached pages are not reactivated and mapped. + * immediately after an mmap(2). Because these are speculative mappings, + * cached pages are not reactivated and mapped. */ void vm_map_pmap_enter(vm_map_t map, vm_offset_t addr, vm_prot_t prot, From owner-p4-projects@FreeBSD.ORG Fri Apr 4 20:48:02 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 07DE8106566B; Fri, 4 Apr 2008 20:48:02 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A32B61065674 for ; Fri, 4 Apr 2008 20:48:01 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 830188FC2A for ; Fri, 4 Apr 2008 20:48:01 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m34Km1P2022023 for ; Fri, 4 Apr 2008 20:48:01 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m34Km18i022021 for perforce@freebsd.org; Fri, 4 Apr 2008 20:48:01 GMT (envelope-from imp@freebsd.org) Date: Fri, 4 Apr 2008 20:48:01 GMT Message-Id: <200804042048.m34Km18i022021@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 139377 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Apr 2008 20:48:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=139377 Change 139377 by imp@imp_paco-paco on 2008/04/04 20:47:14 IFC @139376 Affected files ... .. //depot/projects/mips2-jnpr/src/share/man/man9/sleep.9#2 integrate .. //depot/projects/mips2-jnpr/src/sys/amd64/amd64/pmap.c#6 integrate .. //depot/projects/mips2-jnpr/src/sys/arm/arm/elf_trampoline.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/arm/sa11x0/assabet_machdep.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/conf/Makefile.arm#4 integrate .. //depot/projects/mips2-jnpr/src/sys/i386/i386/pmap.c#5 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/kern_mbuf.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/vm/uma.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/vm/uma_core.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/vm/vm_map.c#4 integrate Differences ... ==== //depot/projects/mips2-jnpr/src/share/man/man9/sleep.9#2 (text+ko) ==== @@ -23,9 +23,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/sleep.9,v 1.61 2007/03/30 18:07:26 julian Exp $ +.\" $FreeBSD: src/share/man/man9/sleep.9,v 1.62 2008/04/04 16:59:58 imp Exp $ .\" -.Dd February 27, 2007 +.Dd April 4, 2008 .Os .Dt SLEEP 9 .Sh NAME @@ -93,6 +93,10 @@ runnable with the specified .Fa priority when it resumes. +.Dv PZERO +should never be used, as it is for compatibility only. +A new priority of 0 means to use the thread's current priority when +it is made runnable again. If .Fa priority includes the ==== //depot/projects/mips2-jnpr/src/sys/amd64/amd64/pmap.c#6 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.611 2008/04/02 04:39:47 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.612 2008/04/04 18:00:22 alc Exp $"); /* * Manages physical address maps. @@ -2904,12 +2904,6 @@ panic("pmap_enter: attempted pmap_enter on 2MB page"); pte = pmap_pde_to_pte(pde, va); } else - pte = NULL; - - /* - * Page Directory table entry not valid, we need a new PT page - */ - if (pte == NULL) panic("pmap_enter: invalid page directory va=%#lx", va); pa = VM_PAGE_TO_PHYS(m); ==== //depot/projects/mips2-jnpr/src/sys/arm/arm/elf_trampoline.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.19 2008/03/22 20:34:07 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.20 2008/04/04 17:35:24 raj Exp $"); #include #include #include @@ -59,6 +59,8 @@ #define cpu_idcache_wbinv_all arm8_cache_purgeID #elif defined(CPU_ARM9) #define cpu_idcache_wbinv_all arm9_idcache_wbinv_all +#elif defined(CPU_ARM9E) +#define cpu_idcache_wbinv_all armv5_ec_idcache_wbinv_all #elif defined(CPU_ARM10) #define cpu_idcache_wbinv_all arm10_idcache_wbinv_all #elif defined(CPU_SA110) || defined(CPU_SA1110) || defined(CPU_SA1100) || \ ==== //depot/projects/mips2-jnpr/src/sys/arm/sa11x0/assabet_machdep.c#3 (text+ko) ==== @@ -47,7 +47,7 @@ #include -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.23 2008/04/03 16:44:50 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.24 2008/04/04 18:22:16 imp Exp $"); #include "opt_md.h" @@ -225,7 +225,7 @@ boothowto = RB_VERBOSE | RB_SINGLE; cninit(); set_cpufuncs(); - lastaddr = fake_reload_metadata(); + lastaddr = fake_preload_metadata(); physmem = memsize / PAGE_SIZE; pc = &__pcpu; pcpu_init(pc, 0, sizeof(struct pcpu)); ==== //depot/projects/mips2-jnpr/src/sys/conf/Makefile.arm#4 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.arm -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.arm,v 1.36 2008/04/03 20:42:36 imp Exp $ +# $FreeBSD: src/sys/conf/Makefile.arm,v 1.38 2008/04/04 19:33:09 imp Exp $ # # Makefile for FreeBSD # @@ -40,6 +40,10 @@ CC += -mbig-endian SYSTEM_LD += -EB LD += -EB +.else +CC += -mlittle-endian +SYSTEM_LD += -EL +LD += -EL .endif @@ -71,7 +75,7 @@ $S/$M/$M/cpufunc_asm_arm8.S $S/$M/$M/cpufunc_asm_arm9.S \ $S/$M/$M/cpufunc_asm_sa1.S $S/$M/$M/cpufunc_asm_arm10.S \ $S/$M/$M/cpufunc_asm_xscale.S $S/$M/$M/cpufunc_asm.S \ - $S/$M/$M/cpufunc_asm_xscale_c3.S + $S/$M/$M/cpufunc_asm_xscale_c3.S $S/$M/$M/cpufunc_asm_armv5_ec.S KERNEL_EXTRA=trampoline KERNEL_EXTRA_INSTALL=kernel.gz.tramp trampoline: ${KERNEL_KO}.tramp ==== //depot/projects/mips2-jnpr/src/sys/i386/i386/pmap.c#5 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.613 2008/03/29 04:29:50 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.614 2008/04/04 18:41:11 alc Exp $"); /* * Manages physical address maps. @@ -561,7 +561,9 @@ static void * pmap_pdpt_allocf(uma_zone_t zone, int bytes, u_int8_t *flags, int wait) { - *flags = UMA_SLAB_PRIV; + + /* Inform UMA that this allocator uses kernel_map/object. */ + *flags = UMA_SLAB_KERNEL; return (contigmalloc(PAGE_SIZE, M_PMAPPDPT, 0, 0x0ULL, 0xffffffffULL, 1, 0)); } ==== //depot/projects/mips2-jnpr/src/sys/kern/kern_mbuf.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_mbuf.c,v 1.39 2008/03/16 10:58:05 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_mbuf.c,v 1.40 2008/04/04 18:41:12 alc Exp $"); #include "opt_mac.h" #include "opt_param.h" @@ -352,7 +352,8 @@ mbuf_jumbo_alloc(uma_zone_t zone, int bytes, u_int8_t *flags, int wait) { - *flags = UMA_SLAB_PRIV; + /* Inform UMA that this allocator uses kernel_map/object. */ + *flags = UMA_SLAB_KERNEL; return (contigmalloc(bytes, M_JUMBOFRAME, wait, (vm_paddr_t)0, ~(vm_paddr_t)0, 1, 0)); } ==== //depot/projects/mips2-jnpr/src/sys/vm/uma.h#2 (text+ko) ==== @@ -24,7 +24,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/vm/uma.h,v 1.31 2007/02/11 20:13:52 rwatson Exp $ + * $FreeBSD: src/sys/vm/uma.h,v 1.32 2008/04/04 18:41:12 alc Exp $ * */ @@ -488,6 +488,7 @@ */ #define UMA_SLAB_BOOT 0x01 /* Slab alloced from boot pages */ #define UMA_SLAB_KMEM 0x02 /* Slab alloced from kmem_map */ +#define UMA_SLAB_KERNEL 0x04 /* Slab alloced from kernel_map */ #define UMA_SLAB_PRIV 0x08 /* Slab alloced from priv allocator */ #define UMA_SLAB_OFFP 0x10 /* Slab is managed separately */ #define UMA_SLAB_MALLOC 0x20 /* Slab is a large malloc slab */ ==== //depot/projects/mips2-jnpr/src/sys/vm/uma_core.c#2 (text+ko) ==== @@ -48,7 +48,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/uma_core.c,v 1.148 2007/10/11 20:11:27 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/uma_core.c,v 1.149 2008/04/04 18:41:12 alc Exp $"); /* I should really use ktr.. */ /* @@ -751,6 +751,8 @@ if (flags & UMA_SLAB_KMEM) obj = kmem_object; + else if (flags & UMA_SLAB_KERNEL) + obj = kernel_object; else obj = NULL; for (i = 0; i < keg->uk_ppera; i++) @@ -871,6 +873,8 @@ if (flags & UMA_SLAB_KMEM) obj = kmem_object; + else if (flags & UMA_SLAB_KERNEL) + obj = kernel_object; else obj = NULL; for (i = 0; i < keg->uk_ppera; i++) ==== //depot/projects/mips2-jnpr/src/sys/vm/vm_map.c#4 (text+ko) ==== @@ -63,7 +63,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_map.c,v 1.393 2008/03/12 10:12:01 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_map.c,v 1.394 2008/04/04 19:14:58 alc Exp $"); #include #include @@ -1459,8 +1459,8 @@ * * Preload read-only mappings for the given object's resident pages into * the given map. This eliminates the soft faults on process startup and - * immediately after an mmap(2). Unless the given flags include - * MAP_PREFAULT_MADVISE, cached pages are not reactivated and mapped. + * immediately after an mmap(2). Because these are speculative mappings, + * cached pages are not reactivated and mapped. */ void vm_map_pmap_enter(vm_map_t map, vm_offset_t addr, vm_prot_t prot, From owner-p4-projects@FreeBSD.ORG Fri Apr 4 22:33:55 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BE1861065687; Fri, 4 Apr 2008 22:33:54 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7CEE91065682 for ; Fri, 4 Apr 2008 22:33:54 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 583EA8FC18 for ; Fri, 4 Apr 2008 22:33:54 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m34MXsFE028886 for ; Fri, 4 Apr 2008 22:33:54 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m34MXsad028884 for perforce@freebsd.org; Fri, 4 Apr 2008 22:33:54 GMT (envelope-from pgj@FreeBSD.org) Date: Fri, 4 Apr 2008 22:33:54 GMT Message-Id: <200804042233.m34MXsad028884@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 139380 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Apr 2008 22:33:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=139380 Change 139380 by pgj@disznohal on 2008/04/04 22:33:35 Fix typos, translation. Submitted by: gabor (mentor) Affected files ... .. //depot/projects/docproj_hu/books/handbook/kernelconfig/chapter.sgml#5 edit Differences ... ==== //depot/projects/docproj_hu/books/handbook/kernelconfig/chapter.sgml#5 (text+ko) ==== @@ -54,32 +54,32 @@ - Miért lehet szükségünk egy - saját rendszermagra. + miért lehet szükségünk egy + saját rendszermagra - Hogyan készítsünk + hogyan készítsünk konfigurációs állományt a rendszermaghoz, vagy hogyan módosítsunk egy - már létezõt. + már létezõt - Hogyan használjuk a rendszermag - konfigurációs állományát egy - új rendszermag lefordítására - és létrehozására. + hogyan használjuk a rendszermag + konfigurációs állományát + egy új rendszermag lefordítására + és létrehozására - Hogyan telepítsük az új - rendszermagot. + hogyan telepítsük az új + rendszermagot - Hogyan orvosoljuk a felmerülõ - hibákat. + hogyan orvosoljuk a felmerülõ + problémákat @@ -87,6 +87,7 @@ bemutatásra kerülõ parancsot root felhasználóként kell kiadni a sikeres végrehajtásukhoz. + @@ -99,29 +100,31 @@ eszközöket ismert, és ha meg akartuk változtatni a rendszermag mûködését, akkor fordítanunk - kellett új rendszermagot, majd újraindítanunk - vele a számítógépet. + kellett új rendszermagot, majd újra kellett + indítanunk vele a + számítógépet. - Manapság azonban a &os; már inkább ahhoz - a modellhez mozdult el, ahol a rendszermag - funkcionalitásának nagy részét - mûködésközben az igények szerint - betölthetõ és kidobható modulok - adják. Ezzel lehetõvé válik, hogy a - rendszermag gyorsan illeszkedni tudjon az újonnan - megjelenõ hardvereszközökhöz (mint mondjuk a + Manapság azonban a &os; már inkább + afelé a megközelítés felé halad, + ahol a rendszermag funkcionalitásának nagy + részét mûködésközben az + igények szerint betölthetõ és + eltávolítható modulok adják. Ezzel + lehetõvé válik, hogy a rendszermag gyorsan + illeszkedjen az újonnan megjelenõ + hardvereszközökhöz (mint például a laptopok PCMCIA-kártyáihoz), vagy olyan új - funkciókat tegyünk a rendszermaghoz, amelyet a + funkciókat tegyünk a rendszermaghoz, amelyek a fordításánál nem voltak - feltétlenül szükségesek. Az ilyet nevezik - moduláris rendszermagnak. + feltétlenül szükségesek. Ezt a modellt + nevezik moduláris rendszermagnak. Ennek ellenére még mindig elkerülhetetlen, - hogy ne legyen valamennyi szükség a rendszermag statikus - testreszabására. Ez a legtöbb esetben azzal - magyarázható, hogy vannak olyan funkciók, - amelyek túlságosan is szorosan mélyen - helyezkednek el a rendszermagban, ezáltal nem + hogy esetenként ne legyen szükség a rendszermag + statikus testreszabására. Ez a legtöbb esetben + azzal magyarázható, hogy vannak olyan + funkciók, amelyek túlságosan is szorosan + mélyen helyezkednek el a rendszermagban, ezáltal nem tölthetõek be dinamikusan. Máskor viszont egyszerûen azért nem lehetséges, mert még senki sem szánt idõt az adott @@ -129,13 +132,13 @@ modul elkészítésére. Egy saját rendszermag készítése - azon legfontosabb próbatételek egyike, melyet majdnem - az összes BSD felhasználónak ki kell + azon legfontosabb próbatételek egyike, melyet + majdnem az összes BSD felhasználónak ki kell állnia. Ez a folyamat, habár némileg - idõigényes, számos elõny tartogat &os; + idõigényes, számos elõnyt tartogat &os; rendszerünk számára. Eltérõen egy GENERIC (általános) - rendszermagtól, mely rengeteg hardvert támogat, egy + rendszermagtól, amely rengeteg hardvert támogat, egy saját rendszermag csak a saját PC-nk hardverét ismeri. Ennek több elõnye is van, például: @@ -166,7 +169,8 @@ saját rendszermagunkba olyan eszközök támogatását is beletehetjük, amelyek nem szerepelnek a GENERIC rendszermagban, - mint mondjuk a hangkártyákét. + mint például a + hangkártyákét. @@ -281,6 +285,7 @@ Saját rendszermag készítése és telepítése + rendszermag készítése, @@ -295,7 +300,7 @@ /sys néven is elérhetõ. Itt rengeteg alkönyvtár található, mindegyikük a rendszermag különbözõ - részeit testesítik meg. Ezek közül most + részeit testesíti meg. Ezek közül most számunkra a legfontosabb az architektúra/conf lesz, ahol majd létrehozzuk a saját rendszermagunk @@ -420,15 +425,16 @@ adnunk, de az Irodalomjegyzékben található könyvek közül sokban - elég jól bemutatják. Habár a &os; - ajánl egy könnyebb szövegszerkesztõt is az - ee személyében, amely a - kezdõk számára az ideális - választás. Nyugodtan átírhatjuk az - elöl található megjegyzéseket a - saját konfigurációnknak megfelelõen, - vagy akár azt is rögzíthetjük, miben - tértünk el a GENERIC + elég jól bemutatják. Ezen kívül + a &os; ajánl egy könnyebben megtanulható + szövegszerkesztõt is az ee + személyében, amely a kezdõk + számára az ideális választás. + Nyugodtan átírhatjuk az elöl + található megjegyzéseket a saját + konfigurációnknak megfelelõen, vagy akár + azt is rögzíthetjük, miben tértünk el + a GENERIC beállításaitól. SunOS @@ -436,11 +442,11 @@ Ha fordítottunk már rendszermagot &sunos; vagy más BSD operációs rendszer alatt, ez az állomány ismerõsnek tûnhet. Ha viszont - más operációs rendszerek, mint mondjuk a DOS, - felõl érkezünk, a GENERIC - konfigurációs állomány egy - kissé túláradónak hathat - számunkra, ezért GENERIC konfigurációs + állomány egy kissé terebélyesnek + tûnhet számunkra, ezért A konfigurációs állomány címû részt figyelmesen és lassan olvassuk át. @@ -512,7 +518,8 @@ MODULES_OVERRIDE = linux acpi sound/sound sound/driver/ds1 ntfs Ez a változó megadja a ténylegesen - lefordítandó modulok listáját. + lefordítandó modulok + listáját. WITHOUT_MODULES = linux acpi sound/sound sound/driver/ds1 ntfs @@ -524,20 +531,18 @@ oldalán olvashatunk. - - /boot/kernel.old - + /boot/kernel.old Ezután az új rendszermag a /boot/kernel könyvtárba kerül /boot/kernel/kernel néven - és a korábbi rendszermag pedig a - /boot/kernel.old/kernel - állomány lesz. Most állítsuk le a - rendszert és indítsuk újra az új - rendszermag aktiválásához. Ha közben - valamilyen hiba történt volna, nézzük meg - a fejezet végén található, /boot/kernel.old/kernel néven + õrzõdik meg. Most állítsuk le a rendszert + és indítsuk újra az új rendszermag + aktiválásához. Ha közben valamilyen + hiba történt volna, nézzük meg a fejezet + végén található, hibakeresésre vonatkozó utasításokat. Mindenképpen olvassuk el azt a részt, amely leírja, hogyan @@ -547,21 +552,22 @@ A rendszerindítási folyamathoz tartozó - további állományok, mint mondjuk a - rendszerbetöltõ (&man.loader.8;) és annak - konfigurációs állománya, a - /boot könyvtárban - találhatóak. A külsõs és - saját modulok a /boot + könyvtárban találhatóak. A + külsõ és saját modulok a /boot/kernel a könyvtárba kerülhetnek, azonban a felhasználóknak nagyon ügyelniük kell rá, hogy az itt található modulok szinkronban legyenek a fordított rendszermaggal. Ellenkezõ esetben a rendszerben - megbízhatlanságot, hibákat + megbízhatatlanságot, hibákat észlelhetünk. + @@ -570,12 +576,14 @@ Joel Dahl - A &os; 6.X verziójára alkalmazta: - + A &os; 6.X verziójához + frissítette: + A konfigurációs állomány + rendszermag NOTES @@ -588,9 +596,9 @@ A konfigurációs állomány - általános formátuma igen egyszerû. Minden - sor tartalmaz egy kulcsszót és egy vagy több - paramétert. A további + általános formátuma igen egyszerû. + Minden sor tartalmaz egy kulcsszót és egy vagy + több paramétert. A további egyszerûsítés kedvéért a legtöbb sor csak egyetlen paramétert tartalmaz. Bármi, ami egy # (kettõskereszt) @@ -612,8 +620,8 @@ Ha olyan állományt akarunk készíteni, amely tartalmazza az összes - lehetséges opciót, mondjuk teszteléshez, - futtassuk le root + lehetséges opciót, például + teszteléshez, futtassuk le root felhasználóként az alábbi parancsot: @@ -630,8 +638,8 @@ rendszermag-konfigurációs állomány ismertetése következik, az érthetõség kedvéért - helyenként megjegyzésekkel kibõvítve. - Az bemutatott állománynak majdnem pontosan meg kell + helyenként megjegyzésekkel kibõvítve. A + bemutatott állománynak majdnem pontosan meg kell egyeznie a rendszerünkben található /usr/src/sys/i386/conf/GENERIC állománnyal. @@ -690,9 +698,9 @@ indítása során, ezért fontos, hogy az új rendszermagunknak más nevet adjunk, ha meg akarjuk különböztetni az általában - használttól (pl. egy - próbálgatásra szánt rendszermagot - akarunk készíteni). + használttól (pl. egy tesztelésre + szánt rendszermagot akarunk + készíteni). # ha a /boot/device.hints használata helyett statikusan bele akarjuk fordítani #hints "GENERIC.hints" # itt szerepelnek az eszközök útmutatásai @@ -714,7 +722,7 @@ makeoptions DEBUG=-g # a nyomkövetéshez szükséges gdb(1) szimbólumok beépítése - A &os; normális fordításának + A &os; hagyományos fordításának folyamata során a rendszermagot a használatával készítjük el, aminek köszönhetõen hibakeresési @@ -723,8 +731,8 @@ options SCHED_4BSD # 4BSD ütemezõ - A &os; hagyományos és alapértelmezett - rendszerütemezõje. Ne bántsuk! + A &os; tradicionális és alapértelmezett + rendszerütemezõje. Ne változtassuk meg! options PREEMPTION # a rendszerszálak megszakíthatóságának engedélyezése @@ -739,10 +747,11 @@ options INET # hálózatkezelés A hálózatkezelés - támogatása. Ne töröljük ki, még - akkor sem, ha nem tervezzük hálózatra kapcsolni a - rendszert. Sok programnak szüksége van - legalább a hurkolt hálózat + támogatása. Ne töröljük ki, + még akkor sem, ha nem tervezzük + hálózatra kapcsolni a rendszert. Sok programnak + szüksége van legalább az ún. loopback + típusú hálózat támogatására (vagyis a számítógépünkön belüli hálózati kapcsolatokra), ezért ez @@ -756,18 +765,19 @@ options FFS # Berkeley gyors állományrendszer Ez a legalapvetõbb merevlemezes - állományrendszer. Hagyjuk meg, ha merevlemezrõl - akarjuk indítani a rendszerünket. + állományrendszer. Hagyjuk meg, ha + merevlemezrõl akarjuk indítani a + rendszerünket. options SOFTUPDATES # az FFS Soft Updates támogatása - Ez a beállítása engedélyezi a + Ez a beállítás engedélyezi a rendszermagban a Soft Updates használatát, amely segít felgyorsítani a lemez írási - sebességét. Habár amikor a rendszermag ezt a - funkcionalitást ismeri, még külön - engedélyezni kell egyes lemezeken. Nézzük meg - a &man.mount.8; kimenetét hogy lássuk, a + sebességét. Ha már a rendszermag ezt a + funkcionalitást ismeri, akkor még külön az + egyes lemezeken is engedélyezni kell. Nézzük + meg a &man.mount.8; kimenetét, hogy lássuk, a rendszerünkben levõ lemezek közül melyiken van ténylegesen engedélyezve a Soft Updates használata. Ha nem látjuk benne sehol sem a @@ -783,7 +793,7 @@ engedélyezhetjük a rendszermagban a hozzáférés-vezérlési listák támogatását. Ez a - kiterjesztett tulajdonságok és az + kiterjesztett attribútumok és az UFS2 használatára támaszkodik. Ezt a lehetõséget részleteiben a ban @@ -799,18 +809,18 @@ options UFS_DIRHASH # nagyobb könyvtárak esetén gyorsulást hoz - Ez a beállítással némi + Ezzel a beállítással némi memória feláldozása árán fel tudjuk gyorsítani a nagyobb könyvtárakon - végzett lemezmûveletek sebességét. - Ezért ezt a beállítást érdemes + végzett lemezmûveletek sebességét, + ezért ezt a beállítást érdemes nagyobb szerverekre vagy interaktívitást - igénylõ munkaállokra tartogatni, és - eltávolítani olyan esetekben, amikor a &os;-t egy - olyan kisebb számítógépeken + igénylõ munkaállomásokra tartogatni, + és eltávolítani olyan esetekben, amikor a + &os;-t egy olyan kisebb számítógépeken használjuk, ahol a memória kevés és a lemezmûveletek sebessége kevésbé fontos, - tehát például egy tûzfalon. + például egy tûzfalon. options MD_ROOT # tudunk memórialemezrõl is rendszert indítani @@ -826,6 +836,7 @@ a rendszermag beállításai NFS_ROOT + options NFSCLIENT # hálózati állományrendszer (NFS) kliens options NFSSERVER # NFS szerver options NFS_ROOT # NFS használható gyökérként is, kell hozzá az NFSCLIENT @@ -840,15 +851,17 @@ a rendszermag beállításai MSDOSFS + options MSDOSFS # MS-DOS állományrendszer Az &ms-dos; állományrendszer. Hacsak nem - akarunk DOS-ra formázott merevlemezes partíciót - csatlakoztatni a rendszerindítás során, - nyugodtan elhagyhatjuk. A fentebb leírtak szerint az - elsõ olyan alkalmalommal automatikusan betöltõdik, - amikor egy DOS partíciót csatlakoztatni akarunk. - Sõt, nagyszerû emulators/mtools szoftver segítségével külön csatlakoztatás és leválasztás @@ -895,14 +908,14 @@ options GEOM_GPT # GUID típusú partíciós táblák használata Ezzel a beállítással engedélyezni - tudjuk nagy mennyiségû partíciót + tudjuk nagy mennyiségû partíció támogatását egyetlen lemezen. options COMPAT_43 # kompatibilitás fenntartása a BSD 4.3-al [NE TÖRÖLD!] Kompatibilitás a 4.3BSD-vel. Ne vegyük ki, mert - bizonyos programok furcsán fognak viselkedni a hiánya - esetén. + bizonyos programok furcsán fognak viselkedni a + hiánya esetén. options COMPAT_FREEBSD4 # kompatibilitás a &os;4-el @@ -914,15 +927,16 @@ Az összes &i386; és Alpha típusú rendszeren ajánlott engedélyezni, mivel itt elõfordulhatnak régebbi alkalmazások. A - többi platform, mint mondjuk az ia64 vagy a &sparc64;, - támogatása csak az 5.X verzióban jelent meg, - ezért ott nincs szükség erre. + többi platform, mint például az ia64 vagy a + &sparc64;, támogatása csak az 5.X verzióban + jelent meg, ezért ott nincs szükség + erre. options COMPAT_FREEBSD5 # kompatibilitás a &os;5-el Ezt a beállítást a &os; 6.X - és afeletti verziókban kell használni az olyan - &os; 5.X verziókra fordított + és afeletti verziókban kell használni az + olyan &os; 5.X verziókra fordított alkalmazások futtatásának támogatásához, melyek a &os; 5.X rendszerhívásait használják. @@ -933,8 +947,8 @@ másodpercig várakozni fog a SCSI eszközök keresése elõtt. Ha kizárolag csak IDE típusú merevlemezeink vannak, nyugodtan - kihagyhatjuk, máskülönben viszont érdemes - a rendszerindítás gyorsítása + kihagyhatjuk, máskülönben érdemes a + rendszerindítás gyorsítása érdekében próbáljuk meg csökkenteni ezt az értéket. Természetesen, ha így teszünk és a &os; @@ -944,32 +958,32 @@ options KTRACE # a ktrace(1) támogatása Engedélyezi a rendszermagban futó rutinok - nyomonkövetését, mely hasznos lehet a + nyomonkövetését, ami hasznos lehet a hibák keresése során. options SYSVSHM # SYSV-szerû osztott memória Ezzel a beállítással engedélyezni tudjuk a rendszerben a System V típusú osztott - memória használatát. Leggyakrabban az X XSHM - kiterjesztése használja, amin keresztül - számos mûveletigényes grafikus program - mûködését fel lehet gyorsítani. Ha - X-et használunk, mindenképpen + memória használatát. Leggyakrabban az X + rendszer XSHM kiterjesztése használja, amelyen + keresztül számos mûveletigényes grafikus + program mûködését fel lehet + gyorsítani. Ha X-et használunk, mindenképpen szükségünk lehet erre. options SYSVMSG # SYSV-szerû üzenetsorok A System V üzenetek támogatása. Ez a beállítás csupán néhány - száz byte-ot tesz hozzá a rendszermaghoz. + száz bájttal növeli a rendszermagot. options SYSVSEM # SYSV-szerû szemaforok A System V szemaforok támogatása. Nem - túl gyakran alkalmazzák õket, de csak - néhány száz byte-tel növeli a - rendszermag méretét. + túl gyakran alkalmazzák õket, de ez csak + néhány száz bájtot tesz hozzá a + rendszermaghoz. A &man.ipcs.1; parancs @@ -1000,22 +1014,22 @@ kizárási mechanizmusnak (blokkolt mutexnek) a neve, amely a rendszermag erõforrásainak jelentõs részét védi. Manapság ez már - egy elfogadhatatlanul szûk keresztmetszet a - teljesítményben, melyet folyamatosan - felváltanak az egyes erõforrásokat - külön-külön védõ - zárolások. Az ADAPTIVE_GIANT - beállítás hatására a Giant az - helyzethez igazodóan forgó mutexek közé - kerül. Ez azt jelenti, hogy amikor egy szál - zárolni akarja a Giant mutexet, de ezt már megtette - elõtte egy másik processzorról futó - szál, a szál tovább fut és - várakozni fog a zárolás - feloldására. Normális esetben ugyanis egy - szál továbbra is blokkolt állapotban marad, - várakozva a futásra. Ha nem tudunk dönteni, - hagyjuk csak benn. + egy elfogadhatatlanul szûk keresztmetszet képez a + teljesítményben, ezért a fejlesztésben + fokozatosan felváltják az egyes + erõforrásokat külön-külön + védõ zárolások. Az + ADAPTIVE_GIANT beállítás + hatására a Giant a helyzethez igazodóan + forgó mutexek közé kerül. Ez azt jelenti, + hogy amikor egy szál zárolni akarja a Giant mutexet, + de ezt már megtette elõtte egy másik + processzorról futó szál, a szál + tovább fut és várakozni fog a + zárolás feloldására. Normális + esetben ugyanis egy szál továbbra is blokkolt + állapotban marad, várakozva a futásra. Ha + nem tudunk dönteni, hagyjuk változatlanul. Hozzátesszük, hogy a &os; 8.0-CURRENT és @@ -1033,6 +1047,7 @@ a rendszermag beállításai SMP + device apic # I/O APIC Az apic nevû eszköz @@ -1040,10 +1055,11 @@ hardveres APIC-ot a megszakítások vezérlésére. Az apic alkalmazható egy- és többprocesszoros rendszerek esetén is - egyaránt, de az SMP rendszermagoknál kell. - Több processzor támogatásánál - mindenképpen tegyük hozzá az options - SMP beállítást. + egyaránt, de az SMP rendszermagoknál + szükséges. Több processzor + támogatásánál mindenképpen + tegyük hozzá az options SMP + beállítást is. Az apic eszköz csak az i386 architektúrán @@ -1055,7 +1071,7 @@ device eisa Abban az esetben engedélyezzük, ha EISA-s - alaplapunk van. Ezzel aktiváljuk az EISA buszra + alaplapunk van, ezzel aktiváljuk az EISA buszra csatlakoztatott eszközök automatikus felismerését és beállíthatóságát. @@ -1069,10 +1085,11 @@ ISA buszok közti átirányítást. - # Floppy meghajtók + # Hajlékonylemezes meghajtók device fdc - Ez a floppy meghajtó vezérlõje. + Ez a hajlékonylemezes meghajtó + vezérlõje. # ATA és ATAPI eszközök device ata @@ -1088,7 +1105,8 @@ Az ATA lemezmeghajtók támogatásához erre van még - szükség a device ata mellett. + szükség a device ata + mellett. device ataraid # ATA RAID-meghajtók @@ -1167,9 +1185,9 @@ device ses # SCSI környezeti szolgáltatások (és SAF-TE) SCSI perifériák. Itt is érvényes, - hogy kivethetjük azokat az eszközöket, amelyekkel nem - rendelkezünk. De ha csak IDE hardvereink vannak, teljesen - eltávolíthatjuk õket. + hogy kivethetjük azokat az eszközöket, amelyekkel + nem rendelkezünk. De ha csak IDE hardvereink vannak, + teljesen eltávolíthatjuk õket. Annak ellenére, hogy valójában nem @@ -1220,7 +1238,7 @@ biztosítja. Erre a vezérlõre a billentyûzet meghajtójának (atkbd) és a PS/2 - pozícionáló eszközöknek + pozícionáló eszközök eszközmeghajtójának (psm) is szüksége van. @@ -1237,7 +1255,7 @@ Használjuk ezt az eszközt, ha az egerünk a PS/2 portra csatlakozik. - device kbdmux # billentyûzet többszörözõ + device kbdmux # billentyûzet multiplexer A billentyûzet többszörözés alapszintû támogatása. Ha nem @@ -1264,12 +1282,13 @@ hasonlít a SCO konzolra. Mivel a legtöbb teljesképernyõs program a termcap termináladatbázis könyvtáron - keresztül éri a konzolt, nem igazán - számít, hogy ezt vagy a vt - VT220-kompatibilits konzolmeghajtót - használjuk. Ha bármilyen gondunk lenne a - teljesképernyõs programok futtatásával - ezen konzolon, a bejelentkezéskor állítsuk a + keresztül éri el a konzolt, nem igazán + számít, hogy ezt vagy a + VT220-kompatibilis vt + konzolmeghajtót használjuk. Ha bármilyen + gondunk lenne a teljesképernyõs programok + futtatásával ezen a konzolon, a + bejelentkezéskor állítsuk a TERM környezeti változónkat scoansira. @@ -1304,9 +1323,7 @@ támogatását az õket ismerõ kártyák számára. - - APM - + APM # energiagazdálkodás támogatása (bõvebben ld. NOTES) #device apm @@ -1322,7 +1339,8 @@ device pmtimer Az energiagazdálkodási események, mint - mondjuk APM és ACPI, idõzítõjének + például APM és ACPI + idõzítõjének eszközmeghajtója. # PCCARD (PCMCIA) támogatás @@ -1332,7 +1350,8 @@ device cardbus # CardBus (32 bites) busz A PCMCIA támgotása. Mindenképpen - szükségünk lesz rá, ha laptopunk van. + szükségünk lesz rá, ha laptopunk + van. # soros (COM) portok device sio # 8250, 16[45]50 alapú soros portok @@ -1365,7 +1384,7 @@ Minden egyes soros portnak egyedi IRQ-ja kell legyen (hacsak nem használunk olyan többportos - kártyát, amely támogatja az osztott + kártyát, amely támogatja a megosztott megszakításokat), ezért a COM3 és COM4 esetén @@ -1391,8 +1410,9 @@ A fentiek közül mind a három - szükséges a párhuzamos porton csatlakozó - nyomtatók használatához. + szükséges a párhuzamos porton + csatlakozó nyomtatók + használatához. device plip # TCP/IP párhuzamos porton keresztül @@ -1408,6 +1428,7 @@ #device vpo # az scbus és a da kell a használatához zip meghajtó + Ez az Iomaga Zip meghajtóihoz tartozó eszköz. A mûködéséhez szükség van az scbus és @@ -1516,8 +1537,8 @@ device wlan_tkip # 802.11 TKIP támogatás A 802.11 eszközök esetén a - titkosítás támogatása. Ezeket a sorokat - akkor adjuk meg, ha titkosítást akarunk + titkosítás támogatása. Ezeket a + sorokat akkor adjuk meg, ha titkosítást akarunk használni vagy a 802.11i biztonsági protokolljait. @@ -1535,9 +1556,9 @@ támogatása. # Pszeudo eszközök -device loop # hálózati hurkolás +device loop # hálózati loopback - Ez a TCP/IP általános hurkolt eszköze. Ha + Ez a TCP/IP általános loopback eszköze. Ha telnettel vagy FTP-vel rácsatlakozunk a localhost címére (vagyis a 127.0.0.1-re), akkor rajta keresztül @@ -1551,10 +1572,10 @@ device ether # Ethernet támogatás - Az etherre csak abban az esetben van - szükség, ha Ethernet kártyán van. Ez - magában foglalja az általános Ethernet - protokoll kódját. + Az ether eszközre csak abban az + esetben van szükség, ha Ethernet kártyán + van. Ez magában foglalja az általános + Ethernet protokoll kódját. device sl # belsõ SLIP @@ -1573,8 +1594,9 @@ programként megvalósított változata is, amely a tun eszközt használja és sokkal nagyobb rugalmasságot kínál - fel, ill. olyan lehetõségeket, mint mondjuk az - igény szerinti tárcsázás. + fel, ill. olyan lehetõségeket, mint + például az igény szerinti + tárcsázás. device tun # csomag alagút @@ -1592,8 +1614,8 @@ portok. A bejövõ telnet és rlogin munkamenetek használják, valamint az xterm és a - hozzá hasonló alkalmazások, mint mondjuk az - Emacs. + hozzá hasonló alkalmazások, mint + például az Emacs. device md # memórialemezek @@ -1603,7 +1625,7 @@ device gif # IPv6 és IPv4 alagutak használata Megvalósítja az IPv6 IPv4 feletti, az IPv4 IPv6 - feletti, az IPv4 IPv4 feletti és az IPv6 IPv6 feletti az + feletti, az IPv4 IPv4 feletti és az IPv6 IPv6 feletti közvetítését. A gif eszköz magától másolódik, vagyis szükség @@ -1682,6 +1704,7 @@ Sok memória kezelése (<acronym>PAE</acronym>) + Fizikai címkiterjesztés (PAE) @@ -1692,8 +1715,8 @@ számítógépek esetén szükség lehet a felhasználói és rendszerszintû virtuális címek - (Kernel Virtual Address, KVA) 4 gigabyte - feletti használatára. Ennek a + (Kernel Virtual Address, KVA) 4 + gigabájt feletti használatára. Ennek a korlátozásnak a kiküszöbölésére az &intel; külön támogatást épített @@ -1705,19 +1728,19 @@ Extension, PAE) az &intel; &pentium; Pro és késõbbi processzoraiban található meg, és lehetõvé - teszi egészen 64 gigabyte-ig a + teszi egészen 64 gigabájtig a memóriahasználatot. A &os; is támogatja ezt a tulajdonságot a rendszermag beállítás használatával, és megtalálható a &os; összes jelenlegi verziójában. Az &intel; memóriaszervezésének korlátai - miatt nem különböztethetõ meg a 4 gigabyte - alatti és feletti memória. A 4 gigabyte felett - található memóriaterületek - egyszerûen hozzáadódnak a - rendelkezésre álló - memóriához. + miatt nem különböztethetõ meg a 4 + gigabájt alatti és feletti memória. A 4 + gigabájt felett található + memóriaterületek egyszerûen + hozzáadódnak a rendelkezésre + álló memóriához. A rendszermagban a PAE támogatását egyszerûen az @@ -1749,7 +1772,8 @@ Egy futó program a virtuális memóriában nem képes 4 - gigabyte-nál többet elérni. + gigabájtnál többet + elérni. @@ -1783,11 +1807,12 @@ memóriahasználatot a rendelkezésre álló fizikai memória mennyiségébõl - számítják ki. Az ilyen + számítják ki. A + PAE támogatással + mûködõ rendszerek esetében + megjelenõ sok memória miatt azonban az ilyen eszközök szükségtelenül - túlfoglalhatnak a PAE-t - ismerõ rendszerek sok memóriával - rendelkezõ természete miatt. Erre + több területet foglalhatnak le. Erre példa lehet a sysctl változó, amely a rendszermag által maximálisan @@ -1823,11 +1848,12 @@ &os; PAE támogatásáról találhatunk naprakész információkat. + - Ha valami rosszul sülne el + Ha valamilyen hiba történne Négyféle probléma jelentkezhet egy saját rendszermag készítése @@ -1931,22 +1957,23 @@ Ha gondok merülnének fel a rendszermag elkészítése során, mindenképpen tartsuk meg a - GENERIC, bármilyen + GENERIC, vagy bármilyen másik olyan rendszermagot, amelyrõl tudjuk, hogy mûködik. Nevezzük át, így nem fog felülíródni a következõ fordítás és - telepítés során. Ugyanis nem - számíthatunk mindig a - kernel.old állományra, + telepítés során. A + kernel.old állományra + ugyanis nem minden esetben számíthatunk, mivel az új rendszermagok telepítésénél a kernel.old mindig felülíródik a legutóbb - telepített rendszermaggal, amely azonban nem minden - esetben mûködõképes. Sõt, - amint csak lehetséges, rakjuk a - mûködõ rendszermagot a /boot/kernel könyvtárba vagy különben a &man.ps.1; és a hozzá hasonló @@ -1968,25 +1995,27 @@ Ha olyan rendszermagot telepítettünk, aminek - a verziója nem egyezik meg a hozzátartozó - segédprogramokéval, tehát - például -CURRENT rendszermagot raktunk egy - -RELEASE rendszerhez, egyes rendszerállapotjelzõ - parancsok, mint mondjuk a &man.ps.1; vagy a &man.vmstat.8; - nem fognak mûködni. Ebben az esetben az egész rendszert újra kell fordítanunk és telepítenünk a rendszermagunkkal megegyezõ verziójú forrásból. Részben ezért sem - különösen díjazandó, ha az + különösen ajánlott, hogy az operációs rendszer többi részétõl eltérõ verziójú rendszermagot - használunk. + használjunk. + From owner-p4-projects@FreeBSD.ORG Fri Apr 4 23:00:22 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9D6A7106566C; Fri, 4 Apr 2008 23:00:22 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6018B1065671 for ; Fri, 4 Apr 2008 23:00:22 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 22C1E8FC0A for ; Fri, 4 Apr 2008 23:00:22 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m34N0MNV029664 for ; Fri, 4 Apr 2008 23:00:22 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m34N0LXW029662 for perforce@freebsd.org; Fri, 4 Apr 2008 23:00:21 GMT (envelope-from sam@freebsd.org) Date: Fri, 4 Apr 2008 23:00:21 GMT Message-Id: <200804042300.m34N0LXW029662@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 139381 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Apr 2008 23:00:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=139381 Change 139381 by sam@sam_ebb on 2008/04/04 22:59:34 detach cloner on module unload Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_freebsd.c#25 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_freebsd.c#25 (text+ko) ==== @@ -639,6 +639,7 @@ if_clone_attach(&wlan_cloner); return 0; case MOD_UNLOAD: + if_clone_detach(&wlan_cloner); return 0; } return EINVAL; From owner-p4-projects@FreeBSD.ORG Fri Apr 4 23:14:40 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4A86D1065677; Fri, 4 Apr 2008 23:14:40 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0C6061065674 for ; Fri, 4 Apr 2008 23:14:40 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DBCF58FC14 for ; Fri, 4 Apr 2008 23:14:39 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m34NEd6H031850 for ; Fri, 4 Apr 2008 23:14:39 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m34NEdsj031848 for perforce@freebsd.org; Fri, 4 Apr 2008 23:14:39 GMT (envelope-from sam@freebsd.org) Date: Fri, 4 Apr 2008 23:14:39 GMT Message-Id: <200804042314.m34NEdsj031848@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 139382 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Apr 2008 23:14:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=139382 Change 139382 by sam@sam_ebb on 2008/04/04 23:14:24 create opt_malo.h; seems weongyo didn't make the options public in HEAD like I did Affected files ... .. //depot/projects/vap/sys/modules/malo/Makefile#3 edit Differences ... ==== //depot/projects/vap/sys/modules/malo/Makefile#3 (text+ko) ==== @@ -3,6 +3,10 @@ .PATH: ${.CURDIR}/../../dev/malo KMOD = if_malo -SRCS = if_malo.c if_malohal.c if_malo_pci.c device_if.h bus_if.h pci_if.h +SRCS = if_malo.c if_malohal.c if_malo_pci.c +SRCS+= device_if.h bus_if.h pci_if.h opt_malo.h + +opt_malo.h: + echo '#define MALO_DEBUG 1'> $@ .include From owner-p4-projects@FreeBSD.ORG Fri Apr 4 23:16:42 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 783111065672; Fri, 4 Apr 2008 23:16:42 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 38E4C106566B for ; Fri, 4 Apr 2008 23:16:42 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 132BB8FC1F for ; Fri, 4 Apr 2008 23:16:42 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m34NGgZx031940 for ; Fri, 4 Apr 2008 23:16:42 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m34NGgvK031938 for perforce@freebsd.org; Fri, 4 Apr 2008 23:16:42 GMT (envelope-from sam@freebsd.org) Date: Fri, 4 Apr 2008 23:16:42 GMT Message-Id: <200804042316.m34NGgvK031938@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 139383 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Apr 2008 23:16:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=139383 Change 139383 by sam@sam_ebb on 2008/04/04 23:16:18 Use if_l2com mechanism to move the ieee80211com structure to an adjunct of the ifnet associated with the parent device: o register a com allocator for IFT_IEEE80211 that allocates an ieee80211com structure o change all use of if_softc in net80211 to if_l2com o replace if_type override in ieee80211_ifattach with an assert; if the driver doesn't setup the ifnet correctly lots of badness will happen o remove ieee80211com structure from the softc of all drivers and change all drivers to use if_l2com to get a reference to the com structure o change all drivers to use sc_ifp to locate the parent device ifnet instead of chasing ic_ifp; this should probably be used only inside net80211 but there's no way to protect it (and there are some callbacks that still require referencing it) o change some driver printfs to use if_printf/device_printf as appropriate (especially rum+ural which still had usb nonsense) Tested: ath, iwn, ral (rt2661), wi, mwl, zyd, ural, bwi, malo Affected files ... .. //depot/projects/vap/sys/dev/ath/ath_rate/sample/sample.c#10 edit .. //depot/projects/vap/sys/dev/ath/ath_rate/sample/sample.h#6 edit .. //depot/projects/vap/sys/dev/ath/if_ath.c#60 edit .. //depot/projects/vap/sys/dev/ath/if_athvar.h#20 edit .. //depot/projects/vap/sys/dev/bwi/bwimac.c#3 edit .. //depot/projects/vap/sys/dev/bwi/bwiphy.c#2 edit .. //depot/projects/vap/sys/dev/bwi/bwirf.c#3 edit .. //depot/projects/vap/sys/dev/bwi/if_bwi.c#6 edit .. //depot/projects/vap/sys/dev/bwi/if_bwivar.h#4 edit .. //depot/projects/vap/sys/dev/ipw/if_ipw.c#10 edit .. //depot/projects/vap/sys/dev/ipw/if_ipwvar.h#8 edit .. //depot/projects/vap/sys/dev/iwi/if_iwi.c#16 edit .. //depot/projects/vap/sys/dev/iwi/if_iwivar.h#10 edit .. //depot/projects/vap/sys/dev/iwn/if_iwn.c#7 edit .. //depot/projects/vap/sys/dev/iwn/if_iwnvar.h#5 edit .. //depot/projects/vap/sys/dev/malo/if_malo.c#3 edit .. //depot/projects/vap/sys/dev/malo/if_malo.h#3 edit .. //depot/projects/vap/sys/dev/mwl/if_mwl.c#4 edit .. //depot/projects/vap/sys/dev/mwl/if_mwlvar.h#2 edit .. //depot/projects/vap/sys/dev/ral/rt2560.c#24 edit .. //depot/projects/vap/sys/dev/ral/rt2560var.h#16 edit .. //depot/projects/vap/sys/dev/ral/rt2661.c#21 edit .. //depot/projects/vap/sys/dev/ral/rt2661var.h#12 edit .. //depot/projects/vap/sys/dev/usb/if_rum.c#14 edit .. //depot/projects/vap/sys/dev/usb/if_rumvar.h#9 edit .. //depot/projects/vap/sys/dev/usb/if_ural.c#17 edit .. //depot/projects/vap/sys/dev/usb/if_uralvar.h#11 edit .. //depot/projects/vap/sys/dev/usb/if_zyd.c#15 edit .. //depot/projects/vap/sys/dev/usb/if_zydreg.h#8 edit .. //depot/projects/vap/sys/dev/wi/if_wi.c#24 edit .. //depot/projects/vap/sys/dev/wi/if_wi_pci.c#7 edit .. //depot/projects/vap/sys/dev/wi/if_wivar.h#16 edit .. //depot/projects/vap/sys/dev/wpi/if_wpi.c#17 edit .. //depot/projects/vap/sys/dev/wpi/if_wpivar.h#7 edit .. //depot/projects/vap/sys/net80211/ieee80211.c#38 edit .. //depot/projects/vap/sys/net80211/ieee80211_ddb.c#12 edit .. //depot/projects/vap/sys/net80211/ieee80211_freebsd.c#26 edit Differences ... ==== //depot/projects/vap/sys/dev/ath/ath_rate/sample/sample.c#10 (text+ko) ==== @@ -239,7 +239,8 @@ { struct sample_node *sn = ATH_NODE_SAMPLE(an); struct sample_softc *ssc = ATH_SOFTC_SAMPLE(sc); - struct ieee80211com *ic = &sc->sc_ic; + struct ifnet *ifp = sc->sc_ifp; + struct ieee80211com *ic = ifp->if_l2com; int ndx, size_bin, mrr, best_ndx, change_rates; unsigned average_tx_time; @@ -491,7 +492,8 @@ ath_rate_tx_complete(struct ath_softc *sc, struct ath_node *an, const struct ath_buf *bf) { - struct ieee80211com *ic = &sc->sc_ic; + struct ifnet *ifp = sc->sc_ifp; + struct ieee80211com *ic = ifp->if_l2com; struct sample_node *sn = ATH_NODE_SAMPLE(an); const struct ath_tx_status *ts = &bf->bf_status.ds_txstat; const struct ath_desc *ds0 = &bf->bf_desc[0]; ==== //depot/projects/vap/sys/dev/ath/ath_rate/sample/sample.h#6 (text+ko) ==== @@ -155,12 +155,13 @@ int length, int rix, int short_retries, int long_retries) { const HAL_RATE_TABLE *rt = sc->sc_currates; + struct ifnet *ifp = sc->sc_ifp; + struct ieee80211com *ic = ifp->if_l2com; int rts, cts; unsigned t_slot = 20; unsigned t_difs = 50; unsigned t_sifs = 10; - struct ieee80211com *ic = &sc->sc_ic; int tt = 0; int x = 0; int cw = WIFI_CW_MIN; ==== //depot/projects/vap/sys/dev/ath/if_ath.c#60 (text+ko) ==== @@ -288,7 +288,7 @@ ath_attach(u_int16_t devid, struct ath_softc *sc) { struct ifnet *ifp; - struct ieee80211com *ic = &sc->sc_ic; + struct ieee80211com *ic; struct ath_hal *ah = NULL; HAL_STATUS status; int error = 0, i; @@ -301,6 +301,7 @@ error = ENOSPC; goto bad; } + ic = ifp->if_l2com; /* set these up early for if_printf use */ if_initname(ifp, device_get_name(sc->sc_dev), @@ -689,7 +690,7 @@ * it last * Other than that, it's straightforward... */ - ieee80211_ifdetach(&sc->sc_ic); + ieee80211_ifdetach(ifp->if_l2com); #ifdef ATH_TX99_DIAG if (sc->sc_tx99 != NULL) sc->sc_tx99->detach(sc->sc_tx99); @@ -1245,9 +1246,10 @@ ath_bmiss_proc(void *arg, int pending) { struct ath_softc *sc = arg; + struct ifnet *ifp = sc->sc_ifp; DPRINTF(sc, ATH_DEBUG_ANY, "%s: pending %u\n", __func__, pending); - ieee80211_beacon_miss(&sc->sc_ic); + ieee80211_beacon_miss(ifp->if_l2com); } /* @@ -1301,7 +1303,8 @@ static void ath_settkipmic(struct ath_softc *sc) { - struct ieee80211com *ic = &sc->sc_ic; + struct ifnet *ifp = sc->sc_ifp; + struct ieee80211com *ic = ifp->if_l2com; if ((ic->ic_cryptocaps & IEEE80211_CRYPTO_TKIP) && !sc->sc_wmetkipmic) { if (ic->ic_flags & IEEE80211_F_WME) { @@ -1318,8 +1321,8 @@ ath_init(void *arg) { struct ath_softc *sc = (struct ath_softc *) arg; - struct ieee80211com *ic = &sc->sc_ic; struct ifnet *ifp = sc->sc_ifp; + struct ieee80211com *ic = ifp->if_l2com; struct ath_hal *ah = sc->sc_ah; HAL_STATUS status; @@ -1479,7 +1482,7 @@ ath_reset(struct ifnet *ifp) { struct ath_softc *sc = ifp->if_softc; - struct ieee80211com *ic = &sc->sc_ic; + struct ieee80211com *ic = ifp->if_l2com; struct ath_hal *ah = sc->sc_ah; HAL_STATUS status; @@ -1607,6 +1610,7 @@ static __inline u_int32_t ath_ff_approx_txtime(struct ath_softc *sc, struct ath_node *an, struct mbuf *m) { + struct ieee80211com *ic = sc->sc_ifp->if_l2com; u_int32_t framelen; struct ath_buf *bf; @@ -1620,7 +1624,7 @@ * - 14: 1 802.3 FF tunnel header (skb already accounts for 2nd) */ framelen = m->m_pkthdr.len + 32 + 4 + 6 + 16 + 14; - if (sc->sc_ic.ic_flags & IEEE80211_F_PRIVACY) + if (ic->ic_flags & IEEE80211_F_PRIVACY) framelen += 24; bf = an->an_ff_buf[M_WME_GETAC(m)]; if (bf != NULL) @@ -1644,7 +1648,7 @@ ath_ff_can_aggregate(struct ath_softc *sc, struct ath_node *an, struct mbuf *m, int *flushq) { - struct ieee80211com *ic = &sc->sc_ic; + struct ieee80211com *ic = sc->sc_ifp->if_l2com; struct ath_txq *txq; u_int32_t txoplimit; u_int pri; @@ -1888,7 +1892,7 @@ ath_start(struct ifnet *ifp) { struct ath_softc *sc = ifp->if_softc; - struct ieee80211com *ic = &sc->sc_ic; + struct ieee80211com *ic = ifp->if_l2com; struct ieee80211_node *ni; struct ath_buf *bf; struct mbuf *m, *next; @@ -2506,8 +2510,8 @@ static u_int32_t ath_calcrxfilter(struct ath_softc *sc) { - struct ieee80211com *ic = &sc->sc_ic; struct ifnet *ifp = sc->sc_ifp; + struct ieee80211com *ic = ifp->if_l2com; u_int32_t rfilt; #if HAL_ABI_VERSION < 0x08011600 @@ -2595,9 +2599,9 @@ static void ath_mode_init(struct ath_softc *sc) { - struct ieee80211com *ic = &sc->sc_ic; + struct ifnet *ifp = sc->sc_ifp; + struct ieee80211com *ic = ifp->if_l2com; struct ath_hal *ah = sc->sc_ah; - struct ifnet *ifp = sc->sc_ifp; u_int32_t rfilt; /* configure rx filter */ @@ -2628,7 +2632,7 @@ static void ath_setslottime(struct ath_softc *sc) { - struct ieee80211com *ic = &sc->sc_ic; + struct ieee80211com *ic = sc->sc_ifp->if_l2com; struct ath_hal *ah = sc->sc_ah; u_int usec; @@ -2663,7 +2667,7 @@ ath_updateslot(struct ifnet *ifp) { struct ath_softc *sc = ifp->if_softc; - struct ieee80211com *ic = &sc->sc_ic; + struct ieee80211com *ic = ifp->if_l2com; /* * When not coordinating the BSS, change the hardware @@ -2700,7 +2704,7 @@ ath_beaconq_config(struct ath_softc *sc) { #define ATH_EXPONENT_TO_VALUE(v) ((1<<(v))-1) - struct ieee80211com *ic = &sc->sc_ic; + struct ieee80211com *ic = sc->sc_ifp->if_l2com; struct ath_hal *ah = sc->sc_ah; HAL_TXQ_INFO qi; @@ -2963,7 +2967,7 @@ } if (sc->sc_stagbeacons) { /* staggered beacons */ - struct ieee80211com *ic = &sc->sc_ic; + struct ieee80211com *ic = sc->sc_ifp->if_l2com; uint32_t tsftu; tsftu = ath_hal_gettsf32(ah) >> 10; @@ -3243,7 +3247,7 @@ ((((u_int32_t)(_h)) << 22) | (((u_int32_t)(_l)) >> 10)) #define FUDGE 2 struct ath_hal *ah = sc->sc_ah; - struct ieee80211com *ic = &sc->sc_ic; + struct ieee80211com *ic = sc->sc_ifp->if_l2com; struct ieee80211_node *ni; u_int32_t nexttbtt, intval, tsftu; u_int64_t tsf; @@ -3894,8 +3898,8 @@ ((_pa) - (_sc)->sc_rxdma.dd_desc_paddr))) struct ath_softc *sc = arg; struct ath_buf *bf; - struct ieee80211com *ic = &sc->sc_ic; struct ifnet *ifp = sc->sc_ifp; + struct ieee80211com *ic = ifp->if_l2com; struct ath_hal *ah = sc->sc_ah; struct ath_desc *ds; struct ath_rx_status *rs; @@ -4281,7 +4285,8 @@ { #define ATH_EXPONENT_TO_VALUE(v) ((1<sc_ic; + struct ifnet *ifp = sc->sc_ifp; + struct ieee80211com *ic = ifp->if_l2com; struct ath_txq *txq = sc->sc_ac2q[ac]; struct wmeParams *wmep = &ic->ic_wme.wme_chanParams.cap_wmeParams[ac]; struct ath_hal *ah = sc->sc_ah; @@ -4294,7 +4299,7 @@ qi.tqi_burstTime = ATH_TXOP_TO_US(wmep->wmep_txopLimit); if (!ath_hal_settxqueueprops(ah, txq->axq_qnum, &qi)) { - device_printf(sc->sc_dev, "unable to update hardware queue " + if_printf(ifp, "unable to update hardware queue " "parameters for %s traffic!\n", ieee80211_wme_acnames[ac]); return 0; @@ -4514,9 +4519,9 @@ { struct ieee80211vap *vap = ni->ni_vap; struct ath_vap *avp = ATH_VAP(vap); - struct ieee80211com *ic = &sc->sc_ic; struct ath_hal *ah = sc->sc_ah; struct ifnet *ifp = sc->sc_ifp; + struct ieee80211com *ic = ifp->if_l2com; const struct chanAccParams *cap = &ic->ic_wme.wme_chanParams; int error, iswep, ismcast, isfrag, ismrr; int keyix, hdrlen, pktlen, try0; @@ -4908,7 +4913,8 @@ ath_tx_processq(struct ath_softc *sc, struct ath_txq *txq) { struct ath_hal *ah = sc->sc_ah; - struct ieee80211com *ic = &sc->sc_ic; + struct ifnet *ifp = sc->sc_ifp; + struct ieee80211com *ic = ifp->if_l2com; struct ath_buf *bf; struct ath_desc *ds, *ds0; struct ath_tx_status *ts; @@ -5149,10 +5155,12 @@ ATH_TXQ_UNLOCK(txq); #ifdef ATH_DEBUG if (sc->sc_debug & ATH_DEBUG_RESET) { + struct ieee80211com *ic = sc->sc_ifp->if_l2com; + ath_printtxbuf(bf, txq->axq_qnum, ix, ath_hal_txprocdesc(ah, bf->bf_desc, &bf->bf_status.ds_txstat) == HAL_OK); - ieee80211_dump_pkt(&sc->sc_ic, mtod(bf->bf_m, caddr_t), + ieee80211_dump_pkt(ic, mtod(bf->bf_m, caddr_t), bf->bf_m->m_len, 0, -1); } #endif /* ATH_DEBUG */ @@ -5220,7 +5228,7 @@ ath_printtxbuf(bf, sc->sc_bhalq, 0, ath_hal_txprocdesc(ah, bf->bf_desc, &bf->bf_status.ds_txstat) == HAL_OK); - ieee80211_dump_pkt(&sc->sc_ic, mtod(bf->bf_m, caddr_t), + ieee80211_dump_pkt(ifp->if_l2com, mtod(bf->bf_m, caddr_t), bf->bf_m->m_len, 0, -1); } } @@ -5340,8 +5348,9 @@ static int ath_chan_set(struct ath_softc *sc, struct ieee80211_channel *chan) { + struct ifnet *ifp = sc->sc_ifp; + struct ieee80211com *ic = ifp->if_l2com; struct ath_hal *ah = sc->sc_ah; - struct ieee80211com *ic = &sc->sc_ic; HAL_CHANNEL hchan; /* @@ -5373,7 +5382,7 @@ ath_draintxq(sc); /* clear pending tx frames */ ath_stoprecv(sc); /* turn off frame recv */ if (!ath_hal_reset(ah, sc->sc_opmode, &hchan, AH_TRUE, &status)) { - if_printf(ic->ic_ifp, "%s: unable to reset " + if_printf(ifp, "%s: unable to reset " "channel %u (%u Mhz, flags 0x%x hal flags 0x%x), " "hal status %u\n", __func__, ieee80211_chan2ieee(ic, chan), chan->ic_freq, @@ -5389,8 +5398,8 @@ * Re-enable rx framework. */ if (ath_startrecv(sc) != 0) { - if_printf(ic->ic_ifp, - "%s: unable to restart recv logic\n", __func__); + if_printf(ifp, "%s: unable to restart recv logic\n", + __func__); return EIO; } @@ -5922,7 +5931,8 @@ static int ath_getchannels(struct ath_softc *sc) { - struct ieee80211com *ic = &sc->sc_ic; + struct ifnet *ifp = sc->sc_ifp; + struct ieee80211com *ic = ifp->if_l2com; struct ath_hal *ah = sc->sc_ah; u_int32_t rd, cc; int error; @@ -5935,12 +5945,10 @@ (void) ath_hal_getregdomain(ah, &rd); ath_hal_getcountrycode(ah, &cc); /* NB: cannot fail */ if (error) { - device_printf(sc->sc_dev, - "%s: unable to collect channel list from hal, error %d\n", - __func__, error); + if_printf(ifp, "%s: unable to collect channel list from hal, " + "error %d\n", __func__, error); if (error == EINVAL) { - device_printf(sc->sc_dev, - "%s: regdomain likely %u country code %u\n", + if_printf(ifp, "%s: regdomain likely %u country code %u\n", __func__, rd, cc); } return error; @@ -6258,7 +6266,7 @@ #define IS_RUNNING(ifp) \ ((ifp->if_flags & IFF_UP) && (ifp->if_drv_flags & IFF_DRV_RUNNING)) struct ath_softc *sc = ifp->if_softc; - struct ieee80211com *ic = &sc->sc_ic; + struct ieee80211com *ic = ifp->if_l2com; struct ifreq *ifr = (struct ifreq *)data; int error = 0; @@ -6698,8 +6706,8 @@ struct ath_buf *bf, struct mbuf *m0, const struct ieee80211_bpf_params *params) { - struct ieee80211com *ic = &sc->sc_ic; struct ifnet *ifp = sc->sc_ifp; + struct ieee80211com *ic = ifp->if_l2com; struct ath_hal *ah = sc->sc_ah; int error, ismcast, ismrr; int hdrlen, pktlen, try0, txantenna; ==== //depot/projects/vap/sys/dev/ath/if_athvar.h#20 (text+ko) ==== @@ -204,7 +204,6 @@ struct ath_tx99; struct ath_softc { - struct ieee80211com sc_ic; /* NB: must be first */ struct ifnet *sc_ifp; /* interface common */ struct ath_stats sc_stats; /* interface statistics */ int sc_debug; ==== //depot/projects/vap/sys/dev/bwi/bwimac.c#3 (text+ko) ==== @@ -833,7 +833,7 @@ uint8_t fw_type) { const struct bwi_fwhdr *hdr; - struct ifnet *ifp = sc->sc_ic.ic_ifp; + struct ifnet *ifp = sc->sc_ifp; if (fw->datasize < sizeof(*hdr)) { if_printf(ifp, "invalid firmware (%s): invalid size %zu\n", @@ -879,7 +879,7 @@ bwi_mac_fw_alloc(struct bwi_mac *mac) { struct bwi_softc *sc = mac->mac_sc; - struct ifnet *ifp = sc->sc_ic.ic_ifp; + struct ifnet *ifp = sc->sc_ifp; char fwname[64]; int idx; @@ -1013,7 +1013,7 @@ bwi_mac_fw_load(struct bwi_mac *mac) { struct bwi_softc *sc = mac->mac_sc; - struct ifnet *ifp = sc->sc_ic.ic_ifp; + struct ifnet *ifp = sc->sc_ifp; const uint32_t *fw; uint16_t fw_rev; int fw_len, i; @@ -1143,7 +1143,7 @@ bwi_mac_fw_load_iv(struct bwi_mac *mac, const struct firmware *fw) { struct bwi_softc *sc = mac->mac_sc; - struct ifnet *ifp = sc->sc_ic.ic_ifp; + struct ifnet *ifp = sc->sc_ifp; const struct bwi_fwhdr *hdr; const struct bwi_fw_iv *iv; int n, i, iv_img_size; @@ -1220,7 +1220,7 @@ static int bwi_mac_fw_init(struct bwi_mac *mac) { - struct ifnet *ifp = mac->mac_sc->sc_ic.ic_ifp; + struct ifnet *ifp = mac->mac_sc->sc_ifp; int error; error = bwi_mac_fw_load_iv(mac, mac->mac_iv); @@ -1241,7 +1241,8 @@ bwi_mac_opmode_init(struct bwi_mac *mac) { struct bwi_softc *sc = mac->mac_sc; - struct ieee80211com *ic = &sc->sc_ic; + struct ifnet *ifp = sc->sc_ifp; + struct ieee80211com *ic = ifp->if_l2com; uint32_t mac_status; uint16_t pre_tbtt; @@ -1341,6 +1342,8 @@ { struct bwi_softc *sc = mac->mac_sc; struct bwi_phy *phy = &mac->mac_phy; + struct ifnet *ifp = sc->sc_ifp; + struct ieee80211com *ic = ifp->if_l2com; struct bwi_retry_lim lim; uint16_t cw_min; @@ -1368,7 +1371,7 @@ /* * Set MAC level acknowledge rates */ - bwi_mac_set_ackrates(mac, &sc->sc_ic.ic_sup_rates[phy->phy_mode]); + bwi_mac_set_ackrates(mac, &ic->ic_sup_rates[phy->phy_mode]); /* * Set CW min @@ -1911,7 +1914,8 @@ bwi_mac_lock(struct bwi_mac *mac) { struct bwi_softc *sc = mac->mac_sc; - struct ieee80211com *ic = &sc->sc_ic; + struct ifnet *ifp = sc->sc_ifp; + struct ieee80211com *ic = ifp->if_l2com; KASSERT((mac->mac_flags & BWI_MAC_F_LOCKED) == 0, ("mac_flags 0x%x", mac->mac_flags)); @@ -1934,7 +1938,8 @@ bwi_mac_unlock(struct bwi_mac *mac) { struct bwi_softc *sc = mac->mac_sc; - struct ieee80211com *ic = &sc->sc_ic; + struct ifnet *ifp = sc->sc_ifp; + struct ieee80211com *ic = ifp->if_l2com; KASSERT(mac->mac_flags & BWI_MAC_F_LOCKED, ("mac_flags 0x%x", mac->mac_flags)); ==== //depot/projects/vap/sys/dev/bwi/bwiphy.c#2 (text+ko) ==== @@ -430,7 +430,7 @@ bwi_phy_init_11b_rev2(struct bwi_mac *mac) { /* TODO:11B */ - if_printf(mac->mac_sc->sc_ic.ic_ifp, + if_printf(mac->mac_sc->sc_ifp, "%s is not implemented yet\n", __func__); } @@ -438,7 +438,7 @@ bwi_phy_init_11b_rev4(struct bwi_mac *mac) { /* TODO:11B */ - if_printf(mac->mac_sc->sc_ic.ic_ifp, + if_printf(mac->mac_sc->sc_ifp, "%s is not implemented yet\n", __func__); } ==== //depot/projects/vap/sys/dev/bwi/bwirf.c#3 (text+ko) ==== @@ -1238,7 +1238,7 @@ bwi_rf_lo_update(struct bwi_mac *mac) { struct bwi_softc *sc = mac->mac_sc; - struct ifnet *ifp = sc->sc_ic.ic_ifp; + struct ifnet *ifp = sc->sc_ifp; struct bwi_rf *rf = &mac->mac_rf; struct bwi_phy *phy = &mac->mac_phy; struct bwi_tpctl *tpctl = &mac->mac_tpctl; @@ -1440,7 +1440,7 @@ static const int rf_lo_measure_order[RF_ATTEN_LISTSZ] = { 3, 1, 5, 7, 9, 2, 0, 4, 6, 8, 10, 11, 12, 13 }; - struct ifnet *ifp = mac->mac_sc->sc_ic.ic_ifp; + struct ifnet *ifp = mac->mac_sc->sc_ifp; struct bwi_rf_lo lo_save, *lo; uint8_t devi_ctrl = 0; int idx, adj_rf7a = 0; ==== //depot/projects/vap/sys/dev/bwi/if_bwi.c#6 (text+ko) ==== @@ -350,7 +350,7 @@ int bwi_attach(struct bwi_softc *sc) { - struct ieee80211com *ic = &sc->sc_ic; + struct ieee80211com *ic; device_t dev = sc->sc_dev; struct ifnet *ifp; struct bwi_mac *mac; @@ -449,6 +449,7 @@ error = ENOSPC; goto fail; } + ic = ifp->if_l2com; /* set these up early for if_printf use */ if_initname(ifp, device_get_name(dev), device_get_unit(dev)); @@ -573,6 +574,7 @@ bwi_detach(struct bwi_softc *sc) { struct ifnet *ifp = sc->sc_ifp; + struct ieee80211com *ic = ifp->if_l2com; int i; BWI_LOCK(sc); @@ -580,7 +582,7 @@ BWI_UNLOCK(sc); callout_drain(&sc->sc_calib_ch); - ieee80211_ifdetach(&sc->sc_ic); + ieee80211_ifdetach(ic); for (i = 0; i < sc->sc_nmac; ++i) bwi_mac_detach(&sc->sc_mac[i]); @@ -1230,8 +1232,8 @@ static void bwi_init_statechg(struct bwi_softc *sc, int statechg) { - struct ieee80211com *ic = &sc->sc_ic; - struct ifnet *ifp = ic->ic_ifp; + struct ifnet *ifp = sc->sc_ifp; + struct ieee80211com *ic = ifp->if_l2com; struct bwi_mac *mac; int error; @@ -1315,7 +1317,7 @@ #define IS_RUNNING(ifp) \ ((ifp->if_flags & IFF_UP) && (ifp->if_drv_flags & IFF_DRV_RUNNING)) struct bwi_softc *sc = ifp->if_softc; - struct ieee80211com *ic = &sc->sc_ic; + struct ieee80211com *ic = ifp->if_l2com; struct ifreq *ifr = (struct ifreq *)req; int error = 0; @@ -1515,8 +1517,7 @@ static void bwi_stop(struct bwi_softc *sc, int statechg) { - struct ieee80211com *ic = &sc->sc_ic; - struct ifnet *ifp = ic->ic_ifp; + struct ifnet *ifp = sc->sc_ifp; struct bwi_mac *mac; int i, error, pwr_off = 0; @@ -1563,8 +1564,8 @@ bwi_intr(void *xsc) { struct bwi_softc *sc = xsc; + struct ifnet *ifp = sc->sc_ifp; struct bwi_mac *mac; - struct ifnet *ifp = sc->sc_ic.ic_ifp; uint32_t intr_status; uint32_t txrx_intr_status[BWI_TXRX_NRING]; int i, txrx_error, tx = 0, rx_data = -1; @@ -2604,8 +2605,8 @@ { struct bwi_ring_data *rd = &sc->sc_rx_rdata; struct bwi_rxbuf_data *rbd = &sc->sc_rx_bdata; - struct ieee80211com *ic = &sc->sc_ic; - struct ifnet *ifp = ic->ic_ifp; + struct ifnet *ifp = sc->sc_ifp; + struct ieee80211com *ic = ifp->if_l2com; int idx, rx_data = 0; idx = rbd->rbd_idx; @@ -2784,7 +2785,7 @@ { struct bwi_ring_data *rd; struct bwi_txbuf_data *tbd; - struct ifnet *ifp = sc->sc_ic.ic_ifp; + struct ifnet *ifp = sc->sc_ifp; uint32_t state, val; int i; @@ -2959,8 +2960,8 @@ struct ieee80211_node *ni) { struct ieee80211vap *vap = ni->ni_vap; - struct ieee80211com *ic = &sc->sc_ic; - struct ifnet *ifp = ic->ic_ifp; + struct ifnet *ifp = sc->sc_ifp; + struct ieee80211com *ic = ifp->if_l2com; struct bwi_ring_data *rd = &sc->sc_tx_rdata[BWI_TX_DATA_RING]; struct bwi_txbuf_data *tbd = &sc->sc_tx_bdata[BWI_TX_DATA_RING]; struct bwi_txbuf *tb = &tbd->tbd_buf[idx]; @@ -3319,7 +3320,7 @@ static void bwi_txeof_status32(struct bwi_softc *sc) { - struct ifnet *ifp = sc->sc_ic.ic_ifp; + struct ifnet *ifp = sc->sc_ifp; uint32_t val, ctrl_base; int end_idx; @@ -3347,7 +3348,7 @@ static void _bwi_txeof(struct bwi_softc *sc, uint16_t tx_id, int acked, int data_txcnt) { - struct ifnet *ifp = sc->sc_ic.ic_ifp; + struct ifnet *ifp = sc->sc_ifp; struct bwi_txbuf_data *tbd; struct bwi_txbuf *tb; int ring_idx, buf_idx; @@ -3439,7 +3440,7 @@ static void bwi_txeof(struct bwi_softc *sc) { - struct ifnet *ifp = sc->sc_ic.ic_ifp; + struct ifnet *ifp = sc->sc_ifp; for (;;) { uint32_t tx_status0, tx_status1; @@ -3711,7 +3712,8 @@ static void bwi_set_bssid(struct bwi_softc *sc, const uint8_t *bssid) { - struct ieee80211com *ic = &sc->sc_ic; + struct ifnet *ifp = sc->sc_ifp; + struct ieee80211com *ic = ifp->if_l2com; struct bwi_mac *mac; struct bwi_myaddr_bssid buf; const uint8_t *p; @@ -3744,7 +3746,7 @@ bwi_updateslot(struct ifnet *ifp) { struct bwi_softc *sc = ifp->if_softc; - struct ieee80211com *ic = &sc->sc_ic; + struct ieee80211com *ic = ifp->if_l2com; struct bwi_mac *mac; BWI_LOCK(sc); @@ -3764,12 +3766,16 @@ bwi_calibrate(void *xsc) { struct bwi_softc *sc = xsc; +#ifdef INVARIANTS + struct ifnet *ifp = sc->sc_ifp; + struct ieee80211com *ic = ifp->if_l2com; +#endif struct bwi_mac *mac; BWI_ASSERT_LOCKED(sc); - KASSERT(sc->sc_ic.ic_opmode != IEEE80211_M_MONITOR, - ("opmode %d", sc->sc_ic.ic_opmode)); + KASSERT(ic->ic_opmode != IEEE80211_M_MONITOR, + ("opmode %d", ic->ic_opmode)); KASSERT(sc->sc_cur_regwin->rw_type == BWI_REGWIN_T_MAC, ("current regwin type %d", sc->sc_cur_regwin->rw_type)); @@ -3914,7 +3920,8 @@ static void bwi_led_newstate(struct bwi_softc *sc, enum ieee80211_state nstate) { - struct ieee80211com *ic = &sc->sc_ic; + struct ifnet *ifp = sc->sc_ifp; + struct ieee80211com *ic = ifp->if_l2com; uint16_t val; int i; ==== //depot/projects/vap/sys/dev/bwi/if_bwivar.h#4 (text+ko) ==== @@ -545,7 +545,6 @@ #define BWI_VAP(vap) ((struct bwi_vap *)(vap)) struct bwi_softc { - struct ieee80211com sc_ic; /* NB: must be first */ struct ifnet *sc_ifp; uint32_t sc_flags; /* BWI_F_ */ device_t sc_dev; ==== //depot/projects/vap/sys/dev/ipw/if_ipw.c#10 (text+ko) ==== @@ -224,7 +224,7 @@ { struct ipw_softc *sc = device_get_softc(dev); struct ifnet *ifp; - struct ieee80211com *ic = &sc->sc_ic; + struct ieee80211com *ic; struct ieee80211_channel *c; uint16_t val; int error, i; @@ -285,6 +285,7 @@ device_printf(dev, "can not if_alloc()\n"); goto fail; } + ic = ifp->if_l2com; ifp->if_softc = sc; if_initname(ifp, device_get_name(dev), device_get_unit(dev)); @@ -392,8 +393,8 @@ ipw_detach(device_t dev) { struct ipw_softc *sc = device_get_softc(dev); - struct ieee80211com *ic = &sc->sc_ic; - struct ifnet *ifp = ic->ic_ifp; + struct ifnet *ifp = sc->sc_ifp; + struct ieee80211com *ic = ifp->if_l2com; ipw_stop(sc); callout_drain(&sc->sc_wdtimer); @@ -777,7 +778,7 @@ ipw_resume(device_t dev) { struct ipw_softc *sc = device_get_softc(dev); - struct ifnet *ifp = sc->sc_ic.ic_ifp; + struct ifnet *ifp = sc->sc_ifp; IPW_LOCK_DECL; IPW_LOCK(sc); @@ -956,7 +957,8 @@ ipw_rx_newstate_intr(struct ipw_softc *sc, struct ipw_soft_buf *sbuf) { #define IEEESTATE(vap) ieee80211_state_name[vap->iv_state] - struct ieee80211com *ic = &sc->sc_ic; + struct ifnet *ifp = sc->sc_ifp; + struct ieee80211com *ic = ifp->if_l2com; struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps); uint32_t state; @@ -1045,7 +1047,8 @@ static void ipw_setcurchan(struct ipw_softc *sc, struct ieee80211_channel *chan) { - struct ieee80211com *ic = &sc->sc_ic; + struct ifnet *ifp = sc->sc_ifp; + struct ieee80211com *ic = ifp->if_l2com; ic->ic_curchan = chan; sc->sc_rxtap.wr_chan_freq = sc->sc_txtap.wt_chan_freq = @@ -1061,7 +1064,8 @@ static void ipw_fix_channel(struct ipw_softc *sc, struct mbuf *m) { - struct ieee80211com *ic = &sc->sc_ic; + struct ifnet *ifp = sc->sc_ifp; + struct ieee80211com *ic = ifp->if_l2com; struct ieee80211_channel *c; struct ieee80211_frame *wh; uint8_t subtype; @@ -1106,8 +1110,8 @@ ipw_rx_data_intr(struct ipw_softc *sc, struct ipw_status *status, struct ipw_soft_bd *sbd, struct ipw_soft_buf *sbuf) { - struct ieee80211com *ic = &sc->sc_ic; - struct ifnet *ifp = ic->ic_ifp; + struct ifnet *ifp = sc->sc_ifp; + struct ieee80211com *ic = ifp->if_l2com; struct mbuf *mnew, *m; struct ieee80211_node *ni; bus_addr_t physaddr; @@ -1195,7 +1199,8 @@ static void ipw_rx_intr(struct ipw_softc *sc) { - struct ieee80211com *ic = &sc->sc_ic; + struct ifnet *ifp = sc->sc_ifp; + struct ieee80211com *ic = ifp->if_l2com; struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps); struct ipw_status *status; struct ipw_soft_bd *sbd; @@ -1299,7 +1304,7 @@ static void ipw_tx_intr(struct ipw_softc *sc) { - struct ifnet *ifp = sc->sc_ic.ic_ifp; + struct ifnet *ifp = sc->sc_ifp; struct ipw_soft_bd *sbd; uint32_t r, i; @@ -1502,7 +1507,8 @@ ipw_tx_start(struct ifnet *ifp, struct mbuf *m0, struct ieee80211_node *ni) { struct ipw_softc *sc = ifp->if_softc; - struct ieee80211com *ic = &sc->sc_ic; + struct ifnet *ifp = sc->sc_ifp; + struct ieee80211com *ic = ifp->if_l2com; struct ieee80211_frame *wh; struct ipw_soft_bd *sbd; struct ipw_soft_hdr *shdr; @@ -1696,8 +1702,8 @@ ipw_watchdog(void *arg) { struct ipw_softc *sc = arg; - struct ieee80211com *ic = &sc->sc_ic; struct ifnet *ifp = sc->sc_ifp; + struct ieee80211com *ic = ifp->if_l2com; IPW_LOCK_ASSERT(sc); @@ -1727,7 +1733,8 @@ ipw_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) { struct ipw_softc *sc = ifp->if_softc; - struct ieee80211com *ic = &sc->sc_ic; + struct ifnet *ifp = sc->sc_ifp; + struct ieee80211com *ic = ifp->if_l2com; struct ifreq *ifr = (struct ifreq *) data; int error = 0; IPW_LOCK_DECL; @@ -1970,7 +1977,8 @@ static int ipw_setwepkeys(struct ipw_softc *sc) { - struct ieee80211com *ic = &sc->sc_ic; + struct ifnet *ifp = sc->sc_ifp; + struct ieee80211com *ic = ifp->if_l2com; struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps); struct ipw_wep_key wepkey; struct ieee80211_key *wk; @@ -2127,7 +2135,8 @@ static int ipw_setchannel(struct ipw_softc *sc, struct ieee80211_channel *chan) { - struct ieee80211com *ic = &sc->sc_ic; + struct ifnet *ifp = sc->sc_ifp; + struct ieee80211com *ic = ifp->if_l2com; uint32_t data; int error; @@ -2142,9 +2151,9 @@ static int ipw_config(struct ipw_softc *sc) { - struct ieee80211com *ic = &sc->sc_ic; + struct ifnet *ifp = sc->sc_ifp; + struct ieee80211com *ic = ifp->if_l2com; struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps); - struct ifnet *ifp = ic->ic_ifp; struct ipw_security security; struct ipw_configuration config; uint32_t data; @@ -2338,7 +2347,8 @@ static int ipw_auth_and_assoc(struct ipw_softc *sc) { - struct ieee80211com *ic = &sc->sc_ic; + struct ifnet *ifp = sc->sc_ifp; + struct ieee80211com *ic = ifp->if_l2com; struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps); struct ieee80211_node *ni = vap->iv_bss; struct ipw_security security; @@ -2426,7 +2436,8 @@ static int ipw_disassociate(struct ipw_softc *sc) { - struct ieee80211com *ic = &sc->sc_ic; + struct ifnet *ifp = sc->sc_ifp; + struct ieee80211com *ic = ifp->if_l2com; struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps); struct ieee80211_node *ni = vap->iv_bss; @@ -2472,7 +2483,8 @@ static void ipw_init_locked(struct ipw_softc *sc, int force) { - struct ieee80211com *ic = &sc->sc_ic; + struct ifnet *ifp = sc->sc_ifp; + struct ieee80211com *ic = ifp->if_l2com; struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps); struct ifnet *ifp = ic->ic_ifp; const struct firmware *fp; @@ -2629,8 +2641,8 @@ static void ipw_stop_locked(struct ipw_softc *sc) { - struct ieee80211com *ic = &sc->sc_ic; - struct ifnet *ifp = ic->ic_ifp; + struct ifnet *ifp = sc->sc_ifp; + struct ieee80211com *ic = ifp->if_l2com; int i; IPW_LOCK_ASSERT(sc); ==== //depot/projects/vap/sys/dev/ipw/if_ipwvar.h#8 (text+ko) ==== @@ -85,7 +85,6 @@ #define IPW_VAP(vap) ((struct ipw_vap *)(vap)) struct ipw_softc { - struct ieee80211com sc_ic; /* NB: must be first */ struct ifnet *sc_ifp; device_t sc_dev; ==== //depot/projects/vap/sys/dev/iwi/if_iwi.c#16 (text+ko) ==== @@ -263,7 +263,7 @@ { struct iwi_softc *sc = device_get_softc(dev); struct ifnet *ifp; - struct ieee80211com *ic = &sc->sc_ic; + struct ieee80211com *ic; uint16_t val; int i, error; uint8_t bands; @@ -357,7 +357,8 @@ device_printf(dev, "can not if_alloc()\n"); goto fail; } - ic->ic_ifp = ifp; + ic = ifp->if_l2com; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Apr 4 23:18:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 04FA31065673; Fri, 4 Apr 2008 23:18:45 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BB086106567D for ; Fri, 4 Apr 2008 23:18:44 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 962808FC12 for ; Fri, 4 Apr 2008 23:18:44 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m34NIiXd031995 for ; Fri, 4 Apr 2008 23:18:44 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m34NIiZs031993 for perforce@freebsd.org; Fri, 4 Apr 2008 23:18:44 GMT (envelope-from sam@freebsd.org) Date: Fri, 4 Apr 2008 23:18:44 GMT Message-Id: <200804042318.m34NIiZs031993@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 139384 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Apr 2008 23:18:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=139384 Change 139384 by sam@sam_ebb on 2008/04/04 23:18:39 remove wlan_scan_ap; it's long gone Affected files ... .. //depot/projects/vap/sys/amd64/conf/GENERIC#11 edit .. //depot/projects/vap/sys/arm/conf/AVILA#8 edit .. //depot/projects/vap/sys/arm/conf/HL200#5 edit .. //depot/projects/vap/sys/arm/conf/KB920X#5 edit .. //depot/projects/vap/sys/conf/NOTES#13 edit .. //depot/projects/vap/sys/pc98/conf/GENERIC#9 edit .. //depot/projects/vap/sys/sparc64/conf/GENERIC#10 edit Differences ... ==== //depot/projects/vap/sys/amd64/conf/GENERIC#11 (text+ko) ==== @@ -239,7 +239,6 @@ device wlan_ccmp # 802.11 CCMP support device wlan_tkip # 802.11 TKIP support device wlan_amrr # AMRR transmit rate control algorithm -device wlan_scan_ap # 802.11 AP mode scanning device wlan_scan_sta # 802.11 STA mode scanning device an # Aironet 4500/4800 802.11 wireless NICs. device ath # Atheros pci/cardbus NIC's ==== //depot/projects/vap/sys/arm/conf/AVILA#8 (text+ko) ==== @@ -131,7 +131,6 @@ device wlan_ccmp # 802.11 CCMP support device wlan_tkip # 802.11 TKIP support device wlan_scan_sta -device wlan_scan_ap device wlan_xauth device ath # Atheros pci/cardbus NIC's device ath_hal # Atheros HAL (Hardware Access Layer) ==== //depot/projects/vap/sys/arm/conf/HL200#5 (text+ko) ==== @@ -147,5 +147,4 @@ device wlan_ccmp # 802.11 CCMP support device wlan_tkip # 802.11 TKIP support device wlan_amrr # AMRR transmit rate control algorithm -device wlan_scan_ap # 802.11 AP mode scanning device wlan_scan_sta # 802.11 STA mode scanning ==== //depot/projects/vap/sys/arm/conf/KB920X#5 (text) ==== @@ -135,5 +135,4 @@ device wlan_ccmp # 802.11 CCMP support device wlan_tkip # 802.11 TKIP support device wlan_amrr # AMRR transmit rate control algorithm -device wlan_scan_ap # 802.11 AP mode scanning device wlan_scan_sta # 802.11 STA mode scanning ==== //depot/projects/vap/sys/conf/NOTES#13 (text+ko) ==== @@ -768,7 +768,6 @@ device wlan_xauth #802.11 external authenticator support device wlan_acl #802.11 MAC ACL support device wlan_amrr #AMRR transmit rate control algorithm -device wlan_scan_ap #802.11 AP mode scanning device wlan_scan_sta #802.11 STA mode scanning device token #Generic TokenRing device fddi #Generic FDDI ==== //depot/projects/vap/sys/pc98/conf/GENERIC#9 (text+ko) ==== @@ -215,7 +215,6 @@ device wlan_ccmp # 802.11 CCMP support device wlan_tkip # 802.11 TKIP support device wlan_amrr # AMRR transmit rate control algorithm -device wlan_scan_ap # 802.11 AP mode scanning device wlan_scan_sta # 802.11 STA mode scanning device an # Aironet 4500/4800 802.11 wireless NICs. device ath # Atheros pci/cardbus NIC's ==== //depot/projects/vap/sys/sparc64/conf/GENERIC#10 (text+ko) ==== @@ -195,7 +195,6 @@ device wlan_wep # 802.11 WEP support device wlan_ccmp # 802.11 CCMP support device wlan_tkip # 802.11 TKIP support -device wlan_scan_ap # 802.11 AP mode scanning device wlan_scan_sta # 802.11 STA mode scanning device ath # Atheros pci/cardbus NIC's device ath_hal # Atheros HAL (Hardware Access Layer) From owner-p4-projects@FreeBSD.ORG Sat Apr 5 00:15:44 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 63B781065678; Sat, 5 Apr 2008 00:15:44 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 24EFA1065676 for ; Sat, 5 Apr 2008 00:15:44 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 033888FC18 for ; Sat, 5 Apr 2008 00:15:44 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m350Fh4R035082 for ; Sat, 5 Apr 2008 00:15:43 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m350FhOk035080 for perforce@freebsd.org; Sat, 5 Apr 2008 00:15:43 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 5 Apr 2008 00:15:43 GMT Message-Id: <200804050015.m350FhOk035080@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 139386 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Apr 2008 00:15:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=139386 Change 139386 by pgj@disznohal on 2008/04/05 00:15:39 Fix typos, translation, format. Submitted by: gabor (mentor) Affected files ... .. //depot/projects/docproj_hu/books/handbook/ports/chapter.sgml#5 edit Differences ... ==== //depot/projects/docproj_hu/books/handbook/ports/chapter.sgml#5 (text+ko) ==== @@ -17,9 +17,10 @@ portok csomagok + A &os; rendszereszközök gazdag gyûjteményével érkezik az alaprendszer - részeként. Azonban a külsõs + részeként. Azonban a külsõ alkalmazások telepítéséhez rengeteg teendõt kell elvégeznünk. A feladat elvégzésére ezért a &os; két, @@ -28,43 +29,46 @@ Portgyûjteményt (telepítés forráskódból) és a csomagokat (telepítés elõre elkészített - binárisokból). Mind a két módszerrel - fel tudjuk telepíteni a kedvenc alkalmazásunk - legújabb verzióját helybõl vagy - egyenesen a hálózatról. + bináris csomagokból). Mind a két + módszerrel fel tudjuk telepíteni a kedvenc + alkalmazásunk legújabb verzióját + lokálisan vagy egyenesen a + hálózatról. A fejezet elolvasása során megismerjük: - Hogyan telepítsünk külsõs - bináris szoftvercsomagokat. + hogyan telepítsünk külsõ + fejlesztésû bináris szoftvercsomagokat - Hogyan fordítsunk le a forrásukból - külsõs szoftvereket a portgyûjtemény - segítségével. + hogyan fordítsunk le a forrásukból + külsõ fejlesztésû szoftvereket a + Portgyûjtemény + segítségével - Hogyan távolítsunk el korábban + hogyan távolítsunk el korábban már telepített csomagokat és - portokat. + portokat - Hogyan bíráljuk felül a - portgyûjtemény által használt - alapértelmezett értékeket. + hogyan bíráljuk felül a + Portgyûjtemény által használt + alapértelmezett értékeket - Hogyan keressük meg a megfelelõ - szoftvercsomagokat. + hogyan keressük meg a megfelelõ + szoftvercsomagokat - Hogyan frissítsük a telepített - alkalmazásokat. + hogyan frissítsük a telepített + alkalmazásokat + @@ -73,7 +77,7 @@ Ha korábban már használtunk &unix; rendszereket, valószínûleg ismerjük a - külsõs alkalmazások + külsõ alkalmazások telepítésének jellemezõ menetét: @@ -107,8 +111,9 @@ Elképzelhetõ, hogy ennek során szerkesztenünk kell a Makefile állományt vagy lefuttatnunk a - configure szkriptet, ill. más - egyet is csinálunk kell. + configure szkriptet, ill. más + lépéseket is el kell + végeznünk. @@ -119,9 +124,9 @@ Ez annak a forgatókönyve, amikor minden hiba nélkül lezajlik. Megeshet azonban, ha olyan szoftvert - telepítünk, melyet kifejezetten nem igazítottak - a &os;-hez, hogy javítanunk kell a - forráskódban a szoftver megfelelõ + telepítünk, amelyet nem terveztek kifejezetten + &os;-hez, hogy javítanunk kell a forráskódban + a szoftver megfelelõ mûködéséhez. Ha sikerül mûködésre bírni, @@ -129,7 +134,7 @@ megszokott módon. Habár a &os; erre a célra két lehetõséget is felkínál, mellyel rengeteg - erõlködéstõl megkímélhet + erõfeszítéstõl megkímélhet minket: ezek a csomagok és a portok. Az írás pillanatában közel &os.numports; külsõ alkalmazás érhetõ el ilyen @@ -159,15 +164,15 @@ elõ. Ne felejtsük el, hogy normális esetben - számos lépcsõt meg kell másznunk egy - program sajátkezû lefordításához - (letöltés, kitömörítés, - javítgatás, fordítás, - telepítés). A portot alkotó - állományok tartalmazzák az összes olyan - szükséges információt, amelyek - átengedik ezt a feladatot a rendszernek. Kiadunk egy - maréknyi egyszerû parancsot, és az + számos lépcsõt végig kell járnunk + egy program sajátkezû + lefordításához (letöltés, + kitömörítés, javítgatás, + fordítás, telepítés). A portot + alkotó állományok tartalmazzák az + összes olyan szükséges információt, + amelyek átengedik ezt a feladatot a rendszernek. Kiadunk + néhány egyszerû parancsot, és az alkalmazás magától letöltõdik, kitömörítõdik, módosítja a forráskódját, lefordul és @@ -200,11 +205,11 @@ Tudván, hogy a két említett megoldás szinte teljesen egyenértékû, felmerülhet a kérdés, a &os; mégis - miért ismeri mindkettõjüket. A csomagoknak - és a portnak is megvannak a maguk elõnyös - oldalai, és hogy a kettõ közül melyiket - használjuk, csak a saját - ízlésünkön múlik. + miért rendelkezik mindkettõvel? A csomagoknak + és a portoknak is megvannak a maguk elõnyei, és + hogy a kettõ közül melyiket használjuk, csak + a saját ízlésünkön + múlik. A csomagok használatának elõnyei @@ -218,7 +223,7 @@ A csomagokat nem kell fordítani. Nagyobb - alkalmazások, mint mondjuk a + alkalmazások, mint például a Mozilla, KDE vagy GNOME esetén ez @@ -266,8 +271,8 @@ átállíthatjuk õket. Egyes esetekben több különféle - beállítást tükrözõ csomag is - létezhet ugyanahhoz az alkalmazáshoz. + beállítást tükrözõ csomag + is létezhet ugyanahhoz az alkalmazáshoz. Például a Ghostscript elérhetõ ghostscript és ghostscript-nox11 @@ -342,17 +347,18 @@ A fejezet fennmaradó részében megmutatjuk, hogyan használjuk &os;-ben a csomagokat - és portokat külsõs alkalmazások + és portokat külsõ alkalmazások telepítésére és karbantartására. + - A számunkra kellõ alkalmazások + <title>A számunkra szükséges alkalmazások megtalálása Mielõtt telepítenénk bármilyen - alkalmazást, ismernünk kell, hogyan is nevezik. + alkalmazást, tudnunk kell, hogyan is nevezik. A &os;-hez elérhetõ alkalmazások listája folyamatosan növekszik. Szerencsére @@ -380,11 +386,12 @@ Dan Langlille a címen karbantartja a FreshPorts nevû oldalt. Ezen az oldalon - folyamatosan nyomon lehet követni a portfában - megtalálható alkalmazásokkal - történõ változásokat, - lehetõvé téve, hogy egy vagy több - portot is figyeljünk, vagy e-mailt + folyamatosan nyomon lehet követni a + Portgyûjteményben megtalálható + alkalmazásokkal történõ + változásokat, lehetõvé téve, + hogy egy vagy több portot is + figyeljünk, vagy e-mailt küldjünk a frissítésükrõl. @@ -443,7 +450,7 @@ Portgyûjtemény beépített keresési mechanizmusát használjuk. Ennek használatához a /usr/ports - könyvtárban kell állnunk. Miután + könyvtárban kell lennünk. Miután beléptünk ide, futtassuk le a make search name=programnév parancsot, ahol a programnév @@ -481,10 +488,10 @@ adott témához kapcsolódnak. A fenti esetek mindegyikében a keresés nem - különbözteti meg a kis- és nagybetûket. - Tehát a LSOF keresése ugyanazt az - eredményt adja, mint az lsof - esetén. + különbözteti meg a kis- és + nagybetûket. Tehát a LSOF + keresése ugyanazt az eredményt adja, mint az + lsof esetén. @@ -493,11 +500,11 @@ - + Chern Lee Írta: - + @@ -505,14 +512,14 @@ Csomagok telepítése + csomagok telepítése - - pkg_add - + pkg_add + A &man.pkg.add.1; segédprogram segítségével telepíthetünk fel &os;-hez készült szoftvercsomagokat helyben vagy a @@ -550,17 +557,17 @@ Ha nincsenek egyáltalán helyben csomagjaink - (pl. egy &os; CD-készletben), akkor a legjobban úgy - járunk, ha a használjuk a &man.pkg.add.1; - kapcsolóját. Ennek - hatására a segédprogram + (pl. egy &os; CD-készletben), akkor a legjobban + úgy járunk, ha a használjuk a + &man.pkg.add.1; kapcsolóját. + Ennek hatására a segédprogram önmagától meghatározza a szükséges állományformátumot és verziót, majd letölti FTP-n keresztül és feltelepíti a csomagot. - - pkg_add + pkg_add + &prompt.root; pkg_add -r lsof Az iménti példában a program @@ -576,7 +583,7 @@ programot használja az állományok letöltésére, ami pedig számos egyéb környezeti változót is - tiszteletben tart, mint mondjuk az + tiszteletben tart, mint például az FTP_PASSIVE_MODE, az FTP_PROXY és az FTP_PASSWORD. Ha tûzfal mögött vagyunk, ezek közül @@ -594,12 +601,13 @@ Ha a &os.current; vagy &os.stable; verziókat - használjuk, a &man.pkg.add.1; mindig az alkalmazás - elérhetõ legfrissebb verzióját fogja - letölteni. Ha azonban valamelyik -RELEASE verziót - használjuk, a csomagnak az adott kiadáshoz - készült verzióját fogja leszedni. - Ezt az észjárást a + használjuk, a &man.pkg.add.1; mindig az + alkalmazás elérhetõ legfrissebb + verzióját fogja letölteni. Ha azonban + valamelyik -RELEASE verziót használjuk, a + csomagnak az adott kiadáshoz készült + verzióját fogja leszedni. Ezt a + mûködési módot a PACKAGESITE változó felülírásával viszont meg tudjuk változtatni. Például ha a @@ -620,7 +628,7 @@ terjesztésre. Ezek az címen, vagy pedig a &os; CD-ken találhatóak - meg. A 4 CD-bõl álló készlet (ill. a + meg. A 4 CD-bõl álló készlet (ill. a PowerPak stb.) minden CD-jén találhatunk csomagokat a packages/ könyvtárban. A csomagokat tároló @@ -647,37 +655,39 @@ csomagok kezelés + A &man.pkg.info.1; egy olyan segédprogram, amellyel készíteni lehet egy listát a telepített csomagokról, és más egyéb információkat tudhatunk meg róluk. - - pkg_info - + pkg_info + &prompt.root; pkg_info cvsup-16.1 A general network file distribution system optimized for CV docbook-1.2 Meta-port for the different versions of the DocBook DTD ... + A &man.pkg.version.1; összefoglalja az összes telepített csomag verzióját. Ezenkívül össze is hasonlítja a csomagok verzióját a portfában található aktuális verziókéval. - - pkg_version - - &prompt.root; pkg_version + + pkg_version + + &prompt.root; pkg_version cvsup = docbook = ... A második oszlopban látható jelek - utalnak a telepített verzió a helyi portfában - található verzióéhoz - viszonyított korára. + utalnak a telepített verzió a helyi + portfában található + verzióéhoz viszonyított + korára. @@ -702,8 +712,8 @@ > A telepített verzió újabb, mint - a portfában található. (A helyi portfa - valószínûleg nem lett + a portfában található. (A helyi + portfa valószínûleg nem lett frissítve.) @@ -736,20 +746,20 @@ Csomagok törlése + + pkg_delete - pkg_delete - - csomagok törlés + Egy korábban már telepített csomag eltávolításához használjuk a &man.pkg.delete.1; segédprogramot. &prompt.root; pkg_delete xchat-1.7.1 - Vegyük észre, hogy a &man.pkg.delete.1; + Vegyük figyelembe, hogy a &man.pkg.delete.1; használatánál szükség van a csomag teljes nevének és verziószámának megadására. A @@ -759,16 +769,18 @@ telepített csomag verzióját azonban könnyedén kitalálhatjuk a &man.pkg.version.1; alkalmazásával. Esetleg egyszerûen - jokerkaraktereket is használhatunk: + dzsókerkaraktereket is használhatunk: &prompt.root; pkg_delete xchat\* - ebben az esetben az összes xchat-tel + Ebben az esetben az összes xchat-tel kezdõdõ csomagot letörli. + Egyebek + A csomagokra vonatkozó összes információ a /var/db/pkg könyvtárban található. Az egyes @@ -776,6 +788,7 @@ telepített állományok listája az ezen a könyvtáron belül elhelyezkedõ állományokban tárolódik. + @@ -783,12 +796,12 @@ A Portgyûjtemény használata A most következõ szakaszok programok a - Portgyûjteményen keresztül történõ - telepítéséhez és - eltávolításához adnak alapvetõ - utasításokat. Az elérhetõ - make célok és környezeti - változók részletesebb + Portgyûjteményen keresztül + történõ telepítéséhez + és eltávolításához adnak + alapvetõ utasításokat. Az elérhetõ + make targetek neveinek és + környezeti változók részletesebb leírását a &man.ports.7; man oldalán lelhetjük meg. @@ -796,9 +809,9 @@ A Portgyûjtemény beszerzése Elsõként magát a - Portgyûjteményt kell megszereznünk, mielõtt - bármelyik portot is tudnánk telepíteni - — ez lényegében a + Portgyûjteményt kell megszereznünk, + mielõtt bármelyik portot is tudnánk + telepíteni — ez lényegében a /usr/ports könyvtárban megtalálható Makefile-ok, javítások és leírások @@ -826,12 +839,13 @@ A &os; 6.2 változatától kezdve az - alaprendszerben a CVSup protokollt - a csup valósítja - meg. A &os; korábbi változatának - használói ezt a programot a net/csup porton vagy csomagon - keresztül tudják feltelepíteni. + alaprendszerben a CVSup + protokollt a csup + valósítja meg. A &os; korábbi + változatának használói ezt a + programot a net/csup + porton vagy csomagon keresztül tudják + feltelepíteni. Gondoskodjunk róla, hogy a csup elsõ futtatása elõtt! Ha már más forrásból felraktuk ide a Portgyûjteményt, a - csup nem fogja lenyesegetni az + csup nem fogja lenyesegetni a javításokat tartalmazó eltávolított állományokat. @@ -861,7 +875,7 @@ Ha például el akarjuk kerülni a - CVSupszerver + CVSup szerver megadását a parancssorban, akkor mindenképpen érdemes a ports-supfile @@ -873,9 +887,10 @@ Ebben az esetben root felhasználóként másoljuk a /usr/share/examples/cvsup/ports-supfile - állományt egy új helyre, mondjuk - a /root könyvtárba - vagy a saját felhasználói + állományt egy új helyre, + például a /root + könyvtárba vagy a saját + felhasználói könyvtárunkba. @@ -989,7 +1004,6 @@ &prompt.root; portsnap update - @@ -1020,7 +1034,7 @@ - Menjünk le és álljunk meg + Menjünk le és álljunk meg a Configure (Beállítások), menüpontnál, és nyomjunk Entert. @@ -1042,14 +1056,14 @@ Menjünk fel az Exit - (Kilépés) ponthoz, üssünk + (Kilépés) ponthoz, nyomjunk Entert. Válasszuk ki a telepítéshez használni kívánt eszközt, mint - mondjuk CD, FTP stb. + például CD, FTP stb. @@ -1060,7 +1074,7 @@ Végezetül a - sysinstallból + sysinstall programból történõ kilépéshez nyomjunk X-et. @@ -1074,6 +1088,7 @@ portok telepítés + A váz fogalma az elsõ, amit a Portgyûjteménnyel kapcsolatban tisztázni kell. Dióhéjban, egy port váza azon @@ -1099,10 +1114,10 @@ információ a port elkészítéséhez szükséges állományok - letöltéséhez, valamint ezek (&man.md5.1; - és &man.sha256.1; programokkal számolt) - ellenõrzõ összegei a letöltés - utáni ellenõrzések + letöltésérõl, valamint ezek + (&man.md5.1; és &man.sha256.1; programokkal + számolt) ellenõrzõösszegei a + letöltés utáni ellenõrzések elvégzéséhez. @@ -1115,14 +1130,14 @@ javítások többnyire bizonyos állományok módosításaira vonatkozó apró állományok - formájában jelennek meg. Rendesen - szöveges formátumúak, és - általában olyanok szerepelnek bennük, - hogy Töröld a 10. sort vagy + formájában jelennek meg. + Természetüknél fogva szöveges + formátumúak, és általában + olyanok szerepelnek bennük, hogy + Töröld a 10. sort vagy Változtasd meg a 26. sort erre: .... - Ezeket a javításokat eredetileg - patcheknek (foltoknak) nevezik, vagy - másképp diffeknek + Ezeket a javításokat eredetileg patcheknek + (foltoknak) nevezik, vagy másképp diffeknek (eltéréseknek) is, mivel a &man.diff.1; program segítségével hozzák õket létre. @@ -1138,7 +1153,7 @@ bemutatása, mely gyakran többsoros is lehet. - + Egy pkg-plist nevû állomány. Itt találjuk meg a port @@ -1152,7 +1167,7 @@ Egyes portokban szereplhetnek még egyéb - állományok is, mint mondjuk a + állományok is, mint például a pkg-message. Ezeket az állományokat a portrendszer különleges helyzetek kezelésére tartogatja. Ha még @@ -1160,8 +1175,7 @@ állományokról, vagy magukról a portokról általánosságban, lapozzuk fel a &os; - portkészítõk - kézikönyvét. + porterek kézikönyvét. A port ugyan tartalmazza a forráskód lefordításához szükséges @@ -1217,60 +1231,61 @@ A Portgyûjtemény feltételezi, hogy - mûködõ Internet-hozzáféréssel - rendelkezünk. Amennyiben ez nem így lenne, a - terjesztési állományokat, - forráskódokat saját magunknak kell - bemásolnunk a /usr/ports/distfiles + mûködõ + Internet-hozzáféréssel rendelkezünk. + Amennyiben ez nem így lenne, a terjesztési + állományokat, forráskódokat + saját magunknak kell bemásolnunk a + /usr/ports/distfiles könyvtárba. - A kezdéshez lépjünk be a - telepítendõ port - könyvtárába: + A kezdéshez lépjünk be a + telepítendõ port + könyvtárába: - &prompt.root; cd /usr/ports/sysutils/lsof + &prompt.root; cd /usr/ports/sysutils/lsof - Miután beléptünk az - lsof könyvtárába, - láthatjuk a port vázát. A - következõ lépés a - fordítás avagy a port - buildelése - (elkészítése). Ezt egy szimpla - make parancs kiadásával - kezdeményezhetjük. Miután megtettük, - valami ilyesmit kell tapasztalnunk: + Miután beléptünk az + lsof könyvtárába, + láthatjuk a port vázát. A + következõ lépés a + fordítás avagy a port + buildelése + (elkészítése). Ezt egy szimpla + make parancs kiadásával + kezdeményezhetjük. Miután megtettük, + valami ilyesmit kell tapasztalnunk: - &prompt.root; make + &prompt.root; make >> lsof_4.57D.freebsd.tar.gz doesn't seem to exist in /usr/ports/distfiles/. >> Attempting to fetch from ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/. ===> Extracting for lsof-4.57 ... -[a kitömörítés kimenete kimarad] +[ide jön a kitömörítés kimenete] ... >> Checksum OK for lsof_4.57D.freebsd.tar.gz. ===> Patching for lsof-4.57 ===> Applying FreeBSD patches for lsof-4.57 ===> Configuring for lsof-4.57 ... -[a configure szkript kimenete kimarad] +[ide jön a configure szkript kimenete] ... ===> Building for lsof-4.57 ... -[a fordítás kimenete kimarad] +[ide jön a fordítás kimenete] ... &prompt.root; - Vegyük észre, hogy a fordítás - befejeztével visszakapjunk a parancssort. A - soronkövetkezõ lépés a port - telepítése lesz. Ehhez mindösszesen - egyetlen szóval kell kiegészítenünk - a make parancs - meghívását: ez a szó pedig az - install (telepít) lesz. + Vegyük észre, hogy a fordítás + befejeztével visszakapjunk a parancssort. A + soron következõ lépés a port + telepítése lesz. Ehhez mindössze + egyetlen szóval kell kiegészítenünk + a make parancs + meghívását: ez a szó pedig az + install (telepít) lesz. - &prompt.root; make install + &prompt.root; make install ===> Installing for lsof-4.57 ... [a telepítés kimenete kimarad] @@ -1283,172 +1298,172 @@ increased privileges. &prompt.root; - Miután ismét visszakaptuk a parancssort, - már futtatni is tudjuk a frissen telepített - alkalmazásunkat. Mivel az lsof - programnak megnövelt jogosultságokra van - szüksége, egy biztonsági - figyelmeztetést is láthatunk. A portok - létrehozása és telepítése - során érdemes figyelnünk az ehhez - hasonló felbukkanó - figyelmeztetésekre. + Miután ismét visszakaptuk a parancssort, + már futtatni is tudjuk a frissen telepített + alkalmazásunkat. Mivel az lsof + programnak megnövelt jogosultságokra van + szüksége, egy biztonsági + figyelmeztetést is láthatunk. A portok + létrehozása és telepítése + során érdemes figyelnünk az ehhez + hasonló felbukkanó + figyelmeztetésekre. - A telepítés befejeztével nem - árt törölnünk a fordításhoz - felhasznált alkönyvtárat (work) is. Ezzel - nemcsak a drága lemezterületet spóroljuk - meg, hanem megelõzzük a port késõbbi - frissítése során felmerülõ - esetleges problémákat is. + A telepítés befejeztével nem + árt törölnünk a fordításhoz + felhasznált alkönyvtárat (work) is. Ezzel + nemcsak a drága lemezterületet spóroljuk + meg, hanem megelõzzük a port késõbbi + frissítése során felmerülõ + esetleges problémákat is. - &prompt.root; make clean + &prompt.root; make clean ===> Cleaning for lsof-4.57 &prompt.root; - - Az eljárásból két - lépést meg is tudunk takarítani, ha - egyszerûen csak a make install clean - parancsot adjuk ki az elõbb három - lépésben tagolt make, - make install és make - clean parancsok helyett. - + + Az eljárásból két + lépést meg is tudunk takarítani, ha + egyszerûen csak a make install clean + parancsot adjuk ki az elõbb három + lépésben tagolt make, + make install és make + clean parancsok helyett. + - - Bizonyos shellek a PATH környezeti - változóban felsorolt könyvtárakban - található parancsokat - gyorsítótárban tárolják, - ezzel felgyorsítva a hozzájuk tartozó - végrehajtható állományok - keresését. Ha történetesen ilyen - shellt használnánk, az új portok - telepítése után - szükségünk lehet a - rehash parancs kiadására, - mivel enélkül nem tudjuk elérni a frissen - telepített parancsokat. Ezt a parancsot - például a tcsh és a - hozzá hasonló shellekben találhatjuk - meg, az sh és rokonainál - pedig a hash -r ennek a megfelelõje. - A pontos információkat a shellünk - dokumentációjában lelhetjük meg - errõl a témáról. - + + Bizonyos parancsértelmezõk a + PATH környezeti változóban + felsorolt könyvtárakban található + parancsokat gyorsítótárban + tárolják, ezzel felgyorsítva a + hozzájuk tartozó végrehajtható + állományok keresését. Ha + történetesen ilyen parancsértelmezõt + használnánk, az új portok + telepítése után + szükségünk lehet a rehash + parancs kiadására, mivel enélkül nem + tudjuk elérni a frissen telepített parancsokat. + Ezt a parancsot például a + tcsh és a hozzá + hasonló parancsértelmezõkben + találhatjuk meg, az sh és + rokonainál pedig a hash -r ennek a + megfelelõje. A pontos információkat a + parancsértelmezõnk + dokumentációjában lelhetjük meg + errõl a témáról. + - Némely külsõs DVD termékek, mint - mondjuk a &os; - Malltól megrendelhetõ &os; Toolkit, - tartalmazhatnak terjesztési állományokat. - Ezek remekül használhatóak a - Portgyûjteménnyel. Ehhez csatlakoztatnunk kell a - DVD-t a /cdrom könyvtárba. - Ettõl eltérõ csatlakozási pontok - használata esetén ne felejtsük el - átállítani a - CD_MOUNTPTS változót sem a - make számára. Ekkor a szükséges - állományokat úgy fogja kezelni a - rendszer, mintha a merevlemezünkön - lennének. + Némely külsõ DVD termékek, mint + például a &os; Malltól + megrendelhetõ &os; Toolkit, tartalmazhatnak + terjesztési állományokat. Ezek + remekül használhatóak a + Portgyûjteménnyel. Ehhez csatlakoztatnunk kell a + DVD-t a /cdrom könyvtárba. + Ettõl eltérõ csatlakozási pontok + használata esetén ne felejtsük el + átállítani a CD_MOUNTPTS + változót sem a make számára. Ekkor + a szükséges állományokat úgy + fogja kezelni a rendszer, mintha a merevlemezünkön + lennének. - - Vigyázzunk arra, hogy néhány portot - nem lehet CD-n terjeszteni. Ez részben azért - lehet, mert a szükséges állományok - letöltéséhez vagy - viszontterjesztéséhez ki kell tölteni - valamilyen regisztrációs nyomtatványt, - vagy pedig egyéb okok miatt. Tehát ha olyan - portot akarunk telepíteni, ami nincs rajta a CD-n, - mindenképpen netközelben kell - lennünk. - + + Vigyázzunk arra, hogy néhány portot + nem lehet CD-n terjeszteni. Ez részben azért + lehet, mert a szükséges állományok + letöltéséhez illetve újbóli + terjesztéséhez ki kell tölteni valamilyen + regisztrációs nyomtatványt, vagy pedig + egyéb okok miatt. Tehát ha olyan portot akarunk + telepíteni, ami nincs rajta a CD-n, mindenképpen + rendelkeznünk kell Internetes kapcsolattal. + - A portrendszer a &man.fetch.1; segédprogramot - használja az állományok - letöltésére, mely figyelembevesz - különféle környezeti - változókat, ilyenek többek közt az - FTP_PASSIVE_MODE, FTP_PROXY - és az FTP_PASSWORD. Ha tûzfal - mögött vagyunk, szükségünk lehet - ezek némelyikének helyes - beállítására, vagy FTP/HTTP - proxy-t kell használnunk. A &man.fetch.3; man oldala - tartalmazza ezen változók teljes - listáját. + A portrendszer a &man.fetch.1; segédprogramot + használja az állományok + letöltésére, amely figyelembevesz + különféle környezeti + változókat, ilyenek többek közt az + FTP_PASSIVE_MODE, FTP_PROXY + és az FTP_PASSWORD. Ha tûzfal + mögött vagyunk, szükségünk lehet ezek + némelyikének helyes + beállítására, vagy FTP/HTTP proxy-t + kell használnunk. A &man.fetch.3; man oldala tartalmazza + ezen változók teljes + listáját. - A make fetch - azon felhasználók számára - nyújt segítséget, akik nem csatlakoznak - minden esetben a hálózatra. Egyszerûen - csak futtassuk le a könyvtárszerkezet - legtetejérõl (/usr/ports) ezt - a parancsot és a szükséges - állományok letöltõdnek nekünk. A - parancs mûködik az alsóbb szinteken is, - például a /usr/ports/net - könyvtárban. Azonban legyünk tekintettel - arra, hogy ha egy port függ más portoktól - vagy függvénykönyvtáraktól, ez - a parancs nem fogja letölteni a - hozzájuk tartozó állományokat. - Ilyenkor a fetch helyett - használjuk a fetch-recursive - célt. + A make fetch + azon felhasználók számára + nyújt segítséget, akik nem csatlakoznak + minden esetben a hálózatra. Egyszerûen csak + futtassuk le a könyvtárszerkezet + legtetejérõl (/usr/ports) ezt a + parancsot és a szükséges + állományok letöltõdnek nekünk. A + parancs mûködik az alsóbb szinteken is, + például a /usr/ports/net + könyvtárban. Azonban legyünk tekintettel arra, + hogy ha egy port függ más portoktól vagy + függvénykönyvtáraktól, ez a + parancs nem fogja letölteni a + hozzájuk tartozó állományokat. + Ilyenkor a fetch helyett + használjuk a fetch-recursive + célt. - - A make felsõbb szinteken - történõ futtatásával - létre tudjuk hozni az összes vagy csak - kategóriánként az összes portot, - hasonlóan az elõbb említett make - fetch módszerhez. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Apr 5 01:01:40 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 459751065673; Sat, 5 Apr 2008 01:01:40 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E2F061065670 for ; Sat, 5 Apr 2008 01:01:39 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C8AC98FC19 for ; Sat, 5 Apr 2008 01:01:39 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3511dik046256 for ; Sat, 5 Apr 2008 01:01:39 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3511dcY046254 for perforce@freebsd.org; Sat, 5 Apr 2008 01:01:39 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 5 Apr 2008 01:01:39 GMT Message-Id: <200804050101.m3511dcY046254@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 139389 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Apr 2008 01:01:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=139389 Change 139389 by pgj@disznohal on 2008/04/05 01:01:05 Fix typos, translation, format. Submitted by: gabor (mentor) Affected files ... .. //depot/projects/docproj_hu/books/handbook/x11/chapter.sgml#4 edit Differences ... ==== //depot/projects/docproj_hu/books/handbook/x11/chapter.sgml#4 (text+ko) ==== @@ -14,7 +14,8 @@ Ken Tom - Az X.Org X11 szerverére alkalmazta: + Az X.Org X11 szerveréhez frissítette: + Marc @@ -29,7 +30,7 @@ Áttekintés A &os; az X11-en keresztül nyújt a - felhasználók számára erõteljes + felhasználók számára hatékony grafikus felhasználói felületet. Az X11 az X Window System szabadon elérhetõ változata, melyet az &xorg; és az @@ -49,7 +50,7 @@ elérhetõek. Ebben a fejezetben az X11 telepítését - és beállítását járjuk + és beállítását járjuk végig, miközben a hangsúlyt az &xorg; &xorg.version; kiadására helyezzük. Az @@ -74,30 +75,30 @@ - Az X Window System különbözõ + az X Window System különbözõ alkotóelemeit, és hogy ezek miként - mûködnek együtt. + mûködnek együtt - Hogyan telepítsük és - állítsuk be az X11-et. + hogyan telepítsük és + állítsuk be az X11-et - Hogyan telepítsük és használjuk - a különféle ablakkezelõket. + hogyan telepítsük és használjuk + a különféle ablakkezelõket - Hogyan használjunk &truetype; - betûtípusokat az X11-ben. + hogyan használjunk &truetype; + betûtípusokat az X11-ben - Hogyan állítsuk be rendszerünkön a + hogyan állítsuk be rendszerünkön a grafikus bejelentkezést - (XDM). + (XDM) @@ -105,19 +106,19 @@ - Külsõs programok + külsõ programok telepítésének ismerete (). + linkend="ports">) - Az X megértése + Az X áttekintése Az X használata elsõre megdöbbentõ lehet azok számára, akik olyan más grafikus - környezetekben járatosak, mint mondjuk a + környezetekben járatosak, mint például a µsoft.windows; vagy a &macos;. Míg az X minden komponensének részleteit @@ -135,7 +136,7 @@ fajtájában. Az X eredeti fejlesztõcsapata az X elõtt egy másik ablakozó rendszeren dolgozott, aminek a neve W (mint - Window (ablak)) volt. Az X pedig az arab + Window, azaz ablak) volt. Az X pedig az arab ábécében pontosan ezt a betût követi. @@ -145,6 +146,7 @@ Windows elnevezés sértõ lehet egyes emberek számára. Errõl többet a &man.X.7; man oldalon tudhatunk meg többet. + @@ -168,19 +170,19 @@ táblák is használhatóak beviteli eszközként, illetve egy projektor is lehet megjelenítõ). Mindegyik X alkalmazás (mint - mondjuk az XTerm vagy a + például az XTerm vagy a &netscape;) egy kliens. A kliens üzeneteket küld a szervernek, például Kérlek, rajzolj egy ablakot ezekre a koordinátákra, és a szerver pedig - olyan üzeneteket küld, mint mondjuk A - felhasználó az OK gombra + olyan üzeneteket küld, mint például + A felhasználó az OK gombra kattintott. Az otthoni vagy a kisebb irodai környezetben az X - szerver és az X kliensek általában ugyanazon - a számítógépen futnak. Azonban - nagyon is lehetséges, hogy az X szerver egy + szerver és az X kliensek általában + ugyanazon a számítógépen futnak. + Azonban nagyon is lehetséges, hogy az X szerver egy kevésbé erõs gépen fusson, miközben az X alkalmazások (a kliensek) az irodát kiszolgáló erõsebb és @@ -190,8 +192,8 @@ keresztül zajlik. Jegyezzük meg, hogy az X szerver az a - számítógép, ahol a monitor és a - billentyûzet található, az X kliensek pedig + számítógép, ahol a monitor és + a billentyûzet található, az X kliensek pedig azok a programok, amelyek az ablakokat jelenítik meg. @@ -204,13 +206,14 @@ számos különbözõ szabad és kereskedelmi alkalmazás képes pontosan erre. + Az ablakkezelõ Az X kialakításának - filozófiája leginkább a &unix; + filozófiája leginkább a &unix; kialakításának filozófiájához hasonlítható, vagyis eszközöket, ne @@ -218,7 +221,7 @@ az X nem köti meg miként oldjuk meg vele a feladatokat. Helyette különféle eszközeket ad a felhasználó kezébe - és onnantól az õ felelõssége + és onnantól a saját felelõssége eldönteni, hogyan használja ki ezeket. Ez a filozófia az X-ben egészen addig terjed, @@ -266,9 +269,9 @@ kategóriájában. Ráadásul a KDE - és a GNOME munkakörnyezetek - mindegyikének van saját integrált - ablakkezelõje. + és a GNOME + munkakörnyezetek mindegyikének van saját + integrált ablakkezelõje. Az egyes ablakkezelõk mellesleg eltérõ beállítási módszerrel rendelkeznek. @@ -341,8 +344,8 @@ Ez az elv az elõbbi apró - kibõvítése. Amikor a fókusz az - egérmutatót követi, és az + kibõvítése. Amikor a fókusz + az egérmutatót követi, és az egeret a leghátsó ablakra (vagy a háttérre) visszük, akkor valójában egyik ablak sem birtokolja az @@ -377,24 +380,26 @@ Sok ablakkezelõ ismer ezekbõl különbözõ variációikat, - valamint rajtuk kivül más egyéb + valamint rajtuk kívül más egyéb vezérlési elvet is. Ezzel kapcsolatban az adott ablakkezelõ dokumentációjából deríthetünk ki a legtöbbet. + - <quote>Mütyürkék</quote> + Widgetek Az X megközelítése, vagyis az eszközök és nem a szabályok felsorakoztatása, kiterjed az egyes alkalmazásokban látható - különféle ketyerékre is. + különféle widgetekre is. - Az ablakmütyürke (window gadget, - widget) elnevezést azokra a felhasználói + A widget (window gadget, vagyis widget, de + magyarul sok helyen a mütyürke) + elnevezést azokra a felhasználói felületen megjelenõ elemekre használjuk, amelyekkel valamilyen módon kapcsolatba léphetünk: kattinthatunk rájuk, @@ -403,7 +408,8 @@ jelölõnégyzetek, rádiógombok, ikonok, listák és a többi. A µsoft.windows; nyelvén ezeket - vezérlõknek nevezzük. + vezérlõknek (control) + nevezzük. A µsoft.windows; és az &apple; &macos; ezen a téren nagyon merev. Az alkalmazások @@ -433,13 +439,13 @@ használt Qt, esetleg a GNOME-hoz használt GTK+ könyvtárból származó, - korszerû kinézetû mütyürkéket - tartalmaznak. Ebbõl a szempontból - megfigyelhetõ egyfajta tendencia a grafikus - &unix;-alkalmazások + korszerû kinézetû widgeteket tartalmaznak. + Ebbõl a szempontból megfigyelhetõ egyfajta + tendencia a grafikus &unix;-alkalmazások felépítésében, ami minden bizonnyal megkönnyíti a kezdõ felhasználók tájékozódását. + @@ -447,8 +453,9 @@ Az X11 telepítése Az X11 &os;-n alapértelmezett - implementációja az &xorg;. - Az &xorg; az X.Org + implementációja az + &xorg;. Az + &xorg; az X.Org alapítvány által kiadott, az X Window Systemet megvalósító nyílt forráskódú X szerver. Az @@ -473,12 +480,12 @@ Az X11-et természetesen feltelepíthetjük - közvetlenül csomagok segítségével is. - A &man.pkg.add.1; használatával + közvetlenül csomagok segítségével + is. A &man.pkg.add.1; használatával telepíthetõ bináris csomagok is elérhetõek az X11-hez. Amikor a &man.pkg.add.1; programra bízzuk a csomag letöltését, ne - adjunk meg verziószámot. A &man.pkg.add.1; ugyanis + adjunk meg verziószámot, a &man.pkg.add.1; ugyanis mindig automatikusan az alkalmazás legfrissebb verzióját tölti le. @@ -498,9 +505,10 @@ A fejezet további részében szót - ejtünk az X11, valamint egy irodai használatra alkalmas - munkakörnyezet + ejtünk az X11, valamint egy irodai használatra + alkalmas munkakörnyezet beállításáról. + @@ -513,6 +521,7 @@ + Az X11 beállítása &xorg; @@ -541,28 +550,30 @@ A monitor jellemzõibõl állapítja meg az X11, milyen felbontásban és frissítési frekvenciával - mûködtesse. Ezek általában a monitorhoz - tartozó dokumentációból vagy a - gyártó honlapjáról + mûködtesse azt. Ezek általában a + monitorhoz tartozó dokumentációból + vagy a gyártó honlapjáról deríthetõek ki. Igazaból két értékre van szükségünk: a függõleges és a vízszintes frissítési frekvenciára. A videókártya chipkészlete - határozza meg, hogy az X11 melyik meghajtóján - keresztül kommunikál a grafikus hardverrel. Ez a - legtöbb chipkészlet esetén - magától megállapítható, de - ennek ellenére mégis jó tisztában - lenni ezzel arra az esetre, ha az automatikus felismerés - mégsem mûködne. + határozza meg, hogy az X11 melyik + meghajtóján keresztül kommunikál a + grafikus hardverrel. Ez a legtöbb chipkészlet + esetén magától + megállapítható, de ennek ellenére + mégis jó tisztában lenni ezzel arra az + esetre, ha az automatikus felismerés mégsem + mûködne. A grafikus kártya memóriája határozza meg a rendszer által kihasználható felbontást és színmélységet. Ezt fontos tudunk ahhoz, hogy ismerjük a rendszer korlátait. + @@ -576,27 +587,29 @@ &prompt.user; startx - Amennyiben ez nem mûködne, vagy az - alapértelmezések nem felelnek meg számunkra, - az X11 kézzel is beállítható. Az - X11 beállítása egy - többlépcsõs folyamat. Elsõ - lépésünk egy alap konfigurációs - állomány összeállítása - lesz. Rendszeradminisztrátorként adjuk ki az + Amennyiben ez nem mûködne, vagy az + alapértelmezések nem felelnek meg + számunkra, az X11 kézzel is + beállítható. Az X11 + beállítása egy többlépcsõs + folyamat. Elsõ lépésünk egy alap + konfigurációs állomány + összeállítása lesz. + Rendszeradminisztrátorként adjuk ki az alábbi parancsot: &prompt.root; Xorg -configure Ennek segítségével az X11 - xorg.conf.new néven létrehozza - a konfigurációs állomány - vázát a /root - könyvtárban (akár a &man.su.1; parancsot - használjuk, akár közvetlenül így - jelentkezünk be, az imigyen örökölt - rendszeradminisztrátori szerepkör maga után - vonja a $HOME könyvtár + xorg.conf.new néven + létrehozza a konfigurációs + állomány vázát a + /root könyvtárban (akár + a &man.su.1; parancsot használjuk, akár + közvetlenül így jelentkezünk be, az + így örökölt rendszeradminisztrátori + szerepkör maga után vonja a $HOME + könyvtár átállítását is). Az X11 megpróbálja megkeresni a célrendszerben elérhetõ grafikus eszközöket, és @@ -690,9 +703,7 @@ Option "DPMS" - - xorg.conf - + xorg.conf Amíg a xorg.conf.new konfigurációs állományt még @@ -741,9 +752,9 @@ A hibakeresés során maguk az X11 naplóállományai is hasznos eszköznek bizonyulhatnak, mivel ezek minden olyan eszközrõl - tartalmaznak információt, amikhez az X11 + tartalmaznak információt, amelyekhez az X11 szervernek sikerült csatlakoznia. Az - &xorg; naplóit az + &xorg; naplóit a /var/log/Xorg.0.log elnevezést követõ állományokban találjuk meg. A konkrét naplók nevei @@ -788,6 +799,7 @@ esetekben is mûködhet, amikor más programok már nem. + @@ -811,16 +823,16 @@ Ennek segítségével ezt a hardvert is a többi grafikus kártyához hasonlóan - állíthatjuk be. Vegyük észre - azonban, hogy a &man.agp.4; meghajtót - beépítve nem tartalmazó rendszermaggal - futó rendszerekben a &man.kldload.8; paranccsal - utólag már nem tudjuk betölteni! Ezt a - meghajtót már a rendszerindítás - során be kell tudnunk tölteni: vagy a - rendszermagba fordítjuk, vagy pedig a - /boot/loader.conf + állíthatjuk be. Vegyük figyelmbe azonban, + hogy az &man.agp.4; meghajtót beépítve + nem tartalmazó rendszermaggal futó rendszerekben + a &man.kldload.8; paranccsal utólag már nem + tudjuk betölteni! Ezt a meghajtót már a + rendszerindítás során be kell tudnunk + tölteni: vagy a rendszermagba fordítjuk, vagy + pedig a /boot/loader.conf állományban hivatkozunk rá. + @@ -878,7 +890,7 @@ intelligens ahhoz, hogy a szélesvásznú megjelenítéssel kapcsolatos információkat lekérje a monitor I2C/DDC - adatai között, ezért meg tudja + adatai közül, ezért meg tudja állapítani, hogy az eszköz milyen frissítési frekvenciákat és felbontásokat bír el. @@ -913,8 +925,9 @@ timings> <4 vert. timings> Ezáltal a példában látott - "Monitor" szakasz ModeLine - sora így fog kinézni: + "Monitor" szakasz + ModeLine sora így fog + kinézni: Section "Monitor" Identifier "Monitor1" @@ -929,6 +942,7 @@ lépéseket, az X most már valószínûleg el fog indulni az új szélesvásznú monitorunkon. + @@ -943,27 +957,29 @@ + Betûtípusok használata az X11-ben Type1 betûtípusok Az X11-hez tartozó alap betûtípusok nem - mondhatóak kifejezetten ideálisnak mondjuk egy - átlagos asztali kiadványszerkesztõ - alkalmazás számára. A nagyobb - méretû bemutatókon a betûi - szögletesen és idétlenül néznek - ki, a &netscape;-ben megjelenõ - kisebb betûk pedig szinte teljességgel - olvashatatlanok. Viszont rengeteg szabad és nagyon - jó minõségû és könnyen + mondhatóak kifejezetten ideálisnak + például egy átlagos asztali + kiadványszerkesztõ alkalmazás + számára. A nagyobb méretû + bemutatókon a betûi szögletesen és + idétlenül néznek ki, a + &netscape;-ben megjelenõ kisebb + betûk pedig szinte teljességgel olvashatatlanok. + Viszont rengeteg szabad, nagyon jó + minõségû és könnyen használható Type1 (&postscript;) betûtípus érhetõ már el az X11-hez. Például az URW betûtípus-gyûjtemény (x11-fonts/urwfonts) a - szabványos type1 betûtípusok (Times Roman, Helvetice, Palatino és még sok @@ -980,11 +996,12 @@ felül az X11 minimális ügyeskedéssel beállítható a &truetype; betûtípusok használatára is. - Errõl részleteket a &man.X.7; man oldalon, a &truetype; betûtípusokról - szóló szakaszban olvashatunk. + Errõl részleteket a &man.X.7; man oldalon, illetve a + &truetype; + betûtípusokról szóló + szakaszban olvashatunk. - A Portgyûjteménybõl az iménti + A Portgyûjteménybõl az imént említett Type1 betûtípusokat az alábbi parancsok segítségével telepíthetjük: @@ -992,9 +1009,9 @@ &prompt.root; cd /usr/ports/x11-fonts/urwfonts &prompt.root; make install clean - És ugyanígy járjunk el a freefont - és a többi gyûjtemény esetén is. - Az X szerver akkor fogja észlelni ezket a + Ugyanígy járjunk el a freefont és a + többi gyûjtemény esetén is. Az X + szerver akkor fogja észlelni ezket a betûtípusokat, ha hozzáadjuk a következõ sort a konfigurációs állományához @@ -1009,8 +1026,8 @@ &prompt.user; xset fp rehash Ez utóbbi beállítás viszont el - fog veszni az X leállításával, hacsak - nem vesszük hozzá a + fog veszni az X leállításával, + hacsak nem vesszük hozzá a indítószkriptjéhez (ez az ~/.xinitrc a startx használata esetén, illetve az @@ -1023,6 +1040,7 @@ linkend="antialias">élsimítással foglalkozó szakaszban szólunk részletesebben. + @@ -1037,13 +1055,12 @@ Az &xorg; beépített támogatást tartalmaz a &truetype; - betûtípusok kirendereléséhez. - Két különbözõ modul - valósítja meg ezt a feladatot. Ebben - példában a freetype nevû modult - használjuk, mivel sokkal jobban illeszkedik a többi - betûrenderelõhöz. A freetype modul - használatához mindössze az + betûtípusok rendereléséhez. Két + különbözõ modul valósítja meg + ezt a feladatot. Ebben példában a freetype + nevû modult használjuk, mivel sokkal jobban + illeszkedik a többi betûrenderelõhöz. A + freetype modul használatához mindössze az /etc/X11/xorg.conf állomány "Module" szakaszába kell beírnunk a következõ sort: @@ -1051,8 +1068,8 @@ Load "freetype" Most pedig hozzunk létre egy könyvtárat a - &truetype; betûtípusok számára (ez legyen - például a + &truetype; betûtípusok számára (ez + legyen például a /usr/local/lib/X11/fonts/TrueType), majd másoljuk az összes &truetype; betûtípusunkat ide. Vigyázzunk rá, hogy @@ -1089,16 +1106,17 @@ xorg.conf állományhoz egy további FontPath sort. - Ezzel végeztünk is volna. Innentõl kezdve a + Ezzel végeztünk is. Innentõl kezdve a &netscape;, Gimp, a &staroffice; és mindegyik más X alkalmazás fel fogja ismerni a frissen telepített &truetype; betûtípusokat. A nagyon kicsi betûk (egy honlap megtekintése során, - nagyfelbontásban) és nagyon nagy betûk (a + nagyfelbontásban) és a nagyon nagy betûk (a &staroffice; használatakor) most már sokkal jobban fognak mutatni. + @@ -1107,13 +1125,15 @@ Joe Marcus Clarke - Frissítette: + Frissítette: + A betûk élsimítása - élsimított betûk + élsimított + betûk betûk élsimított @@ -1146,7 +1166,7 @@ 1.2 és késõbbi változatai. A betûtípusok - élsimításának be- és + élsimításának be- és kikapcsolásához, valamint élsimítási jellemzõinek beállításához hozzuk létre @@ -1162,57 +1182,59 @@ XML Az állománynak XML formátumúnak - kell lennie. Különösen ügyeljünk a kis- - és nagybetûkre és gyõzödjünk - meg mindig róla, hogy lezártuk-e az összes - taget. Az állomány a szokásos - XML-fejléccel kezdõdik, amelyet egy DOCTYPE - definíció követ, majd a - <fontconfig> tag: + kell lennie. Különösen ügyeljünk a + kis- és nagybetûkre és + gyõzödjünk meg mindig róla, hogy + lezártuk-e az összes taget. Az + állomány a szokásos XML-fejléccel + kezdõdik, amelyet egy DOCTYPE definíció + követ, majd a <fontconfig> + tag: - + <?xml version="1.0"?> <!DOCTYPE fontconfig SYSTEM "fonts.dtd"> <fontconfig> - + - Ahogy azt már korábban is - említettük, a - /usr/local/lib/X11/fonts és a - ~/.fonts/ könyvtárakban - található összes betûtípus - élsimítása elérhetõ az Xft-re - felkészített alkalmazások - számára. Amennyiben ezeken túl még - további könyvtárakat is fel - kívánunk venni, írjuk bele a - /usr/local/etc/fonts/local.conf - állományba, nagyjából ilyen - alakban: + Ahogy azt már korábban is + említettük, a + /usr/local/lib/X11/fonts és a + ~/.fonts/ könyvtárakban + található összes betûtípus + élsimítása elérhetõ az Xft-re + felkészített alkalmazások + számára. Amennyiben ezeken túl még + további könyvtárakat is fel + kívánunk venni, írjuk bele a + /usr/local/etc/fonts/local.conf + állományba, nagyjából ilyen + alakban: - <dir>/az/én/betû/típusaim</dir> + <dir>/az/én/betû/típusaim</dir> - Az új betûtípusok, de - legfõképpen az új betûtípusokat - tartalmazó könyvtárak hozzáadása - után a betûkkel kapcsolatos - gyorsítótárak - frissítéséhez mindenképpen javasolt - lefuttatni az alábbi parancsot: + Az új betûtípusok, de + legfõképpen az új betûtípusokat + tartalmazó könyvtárak + hozzáadása után a betûkkel kapcsolatos + gyorsítótárak + frissítéséhez mindenképpen javasolt + lefuttatni az alábbi parancsot: - &prompt.root; fc-cache -f + &prompt.root; fc-cache -f - Az élsimítás hatására a - betûk kontúrjai egy kissé elmosódnak, - aminek köszönhetõen a nagyon kis méretû - szövegek sokkal olvashatóbbá válnak - és eltûnnek a nagy méretû - betûkrõl a lépcsõk, azonban a - normál méretû betûknél - megfájdulhat tõle a szemünk. A 14 pontnál - kisebb méretû betûk esetén az - alábbi sorok hozzáadásával tudjuk - kikapcsolni az élsimítást: + Az élsimítás hatására a + betûk kontúrjai egy kissé elmosódnak, + aminek köszönhetõen a nagyon kis + méretû szövegek sokkal + olvashatóbbá válnak és eltûnnek + a nagy méretû betûkrõl a + lépcsõk, azonban a normál + méretû betûknél megfájdulhat + tõle a szemünk. A 14 pontnál kisebb + méretû betûk esetén az alábbi + sorok hozzáadásával tudjuk kikapcsolni az + élsimítást: <match target="font"> <test name="size" compare="less"> @@ -1247,7 +1269,7 @@ állítjuk. Ehhez írjuk be a következõ sorokat: - <match target="pattern" name="family"> + <match target="pattern" name="family"> <test qual="any" name="family"> <string>fixed</string> </test> @@ -1278,17 +1300,17 @@ </edit> </match> - - Egyes betûtípusoknál, mint mondjuk a - Helveticánál, gondok akadhatnak az - élsimítással. Ez általában - egy függõlegesen kettévágottnak - látszó betû képében jelenik - meg. De ami a legrosszabb, hogy emiatt némely - alkalmazás, mint mondjuk a - Mozilla képes - összeomlani. Ennek elkerülésére - tegyük hozzá még az alábbi sorokat a + Egyes betûtípusoknál, mint + például a Helveticánál, gondok + akadhatnak az élsimítással. Ez + általában egy függõlegesen + kettévágottnak látszó betû + képében jelenik meg. De ami a legrosszabb, hogy + emiatt némely alkalmazás, mint + például a Mozilla + képes összeomlani. Ennek + elkerülésére tegyük hozzá + még az alábbi sorokat a local.conf állományhoz: @@ -1406,6 +1428,7 @@ Mozillat a -DWITHOUT_XFT kapcsolóval fordítsuk újra. + @@ -1419,11 +1442,14 @@ + Az X bejelentkeztetõ képernyõje + Összefoglalás X Display Manager + Az X bejelentkeztetõ képernyõje (az X Display Manager vagy röviden csak XDM) az X Window System egyik @@ -1440,10 +1466,10 @@ számítógépek széles kombinációja elõfordulhat. Az XDM egy grafikus felületen - keresztül igyekszik segíteni választani az + keresztül segít választani az elérhetõ szerverek között, valamint a felhasználók, például - felhasználói név és jelszón + felhasználónév és jelszón keresztüli, hitelesítésében. Az XDM tulajdonképpen a @@ -1464,14 +1490,15 @@ a bejelentkezéshez és a szerver kiválasztásához szükséges képernyõket jeleníti meg. + Az XDM használata - Az XDM-hez tartozó daemon - a /usr/local/bin/xdm állomány. - Ezt programot root + Az XDM-hez tartozó + démon a /usr/local/bin/xdm + állomány. Ezt programot root felhasználóként bármikor tudjuk futtatni, és ez veszi kezelésbe a helyi gépen futó X szervert. Amennyiben az @@ -1485,7 +1512,7 @@ használatáról bõvebben ld. . Az /etc/ttys alapértelmezett változatában az - XDM daemon virtuális + XDM démon virtuális terminálon történõ futtatását így találhatjuk meg: @@ -1504,6 +1531,7 @@ ttyv8. Ennek megfelelõen az XDM a 9. virtuális terminálon kezdi meg a futását. + @@ -1624,6 +1652,7 @@ csatlakoztathatóságát. Alapértelmezés szerint semmilyen klienst nem enged csatlakozni. + @@ -1637,6 +1666,7 @@ változtathatjuk meg. Formátuma hasonló az X11 dokumentációjában leírt app-defaults állományhoz. + @@ -1645,6 +1675,7 @@ A szerverválasztó által felkínálandó távoli X szerverek felsorolását tartalmazza. + @@ -1656,6 +1687,7 @@ felhasználóhoz tartozik egy saját ~/.xsession szkript, ami ezt felülbírálja. + @@ -1670,8 +1702,9 @@ sorszámával folytatódik (például Xsetup_0). Ezek a szkriptek általában egy-két programot, - mint mondjuk az xconsole, indítanak - el a háttérben. + mint például az xconsole, + indítanak el a háttérben. + @@ -1681,22 +1714,24 @@ állományéhoz hasonló alakban tartalmaz beállításokat a program által kezelt minden egyes X szerverhez. + xdm-errors - Ebben találhatjuk meg az + Ebben található meg az XDM által futtatni próbált X szerverek kimenete. Itt érdemes hibaüzenetek után kutatni, ha az XDM által indított X szerver valamiért megállna. Ezek az - üzenetek egyébként + üzenetek egyébként a felhasználó ~/.xsession-errors állományába is beíródnak. + @@ -1704,8 +1739,8 @@ Hálózati X szerver futtatása Az X szerverünkhöz csak akkor tudnak - kívülrõl más felhasználók is - kapcsolódni, ha átírjuk a + kívülrõl más felhasználók + is kapcsolódni, ha átírjuk a hozzáférésre vonatkozó szabályokat és engedélyezzük rajta a kapcsolódást. A szabályok az @@ -1721,16 +1756,18 @@ DisplayManager.requestPort: 0 Ezután indítsuk újra az - XDM-et. Ne felejtsük el, hogy az - app-defaults állományokban a megjegyzéseket - ! (felkiáltójel)lel kezdõdnek, - nem pedig a megszokott # (kettõskereszt)tel. - A fentieknél természetesen szigorúbb + XDM-et. Ne felejtsük el, hogy + az app-defaults állományokban a + megjegyzéseket ! + (felkiáltójel)lel kezdõdnek, nem pedig a + megszokott # (kettõskereszt)tel. A + fentieknél természetesen szigorúbb hozzáférési szabályok is szükségesek lehetnek — ezzel kapcsolatban nézzük meg Xaccess állományban szereplõ példákat, illetve lapozzuk fel a &man.xdm.1; man oldalt. + @@ -1748,6 +1785,7 @@ számára, hogy a bejelentkezés elõtt kiválaszthassák a használni kívánt ablakkezelõt. + @@ -1767,7 +1805,7 @@ Ebben a szakaszban a &os;-n futó X-hez elérhetõ különbözõ munkakörnyezetekrõl (desktop environment) lesz - szó. Maga az munkakörnyezet + szó. Maga a munkakörnyezet elnevezés sok mindenre utalhat egy mezei ablakkezelõtõl kezdve az asztali alkalmazások teljes garmadájáig, ahogy a @@ -1781,6 +1819,7 @@ Röviden a GNOME-ról GNOME + A GNOME egy >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Apr 5 01:01:41 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0017B106570E; Sat, 5 Apr 2008 01:01:40 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 101411065671 for ; Sat, 5 Apr 2008 01:01:40 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EB4E38FC1A for ; Sat, 5 Apr 2008 01:01:39 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3511dwg046261 for ; Sat, 5 Apr 2008 01:01:39 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3511dE1046259 for perforce@freebsd.org; Sat, 5 Apr 2008 01:01:39 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 5 Apr 2008 01:01:39 GMT Message-Id: <200804050101.m3511dE1046259@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 139390 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Apr 2008 01:01:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=139390 Change 139390 by pgj@disznohal on 2008/04/05 01:01:34 Keep sync with x11. Affected files ... .. //depot/projects/docproj_hu/books/handbook/preface/preface.sgml#5 edit Differences ... ==== //depot/projects/docproj_hu/books/handbook/preface/preface.sgml#5 (text+ko) ==== @@ -388,7 +388,7 @@ Általános bemutatásra kerül az X Window System, valamint az X11 használata a &os;-n. Ezenkívül olvashatunk az elterjedtebb - asztalkörnyezetekrõl, mint pl. a + munkakörnyezetekrõl, mint pl. a KDE és a GNOME. From owner-p4-projects@FreeBSD.ORG Sat Apr 5 01:04:43 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F6371065671; Sat, 5 Apr 2008 01:04:43 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 41585106566B for ; Sat, 5 Apr 2008 01:04:43 +0000 (UTC) (envelope-from kan@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 28F4E8FC14 for ; Sat, 5 Apr 2008 01:04:43 +0000 (UTC) (envelope-from kan@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3514h58047777 for ; Sat, 5 Apr 2008 01:04:43 GMT (envelope-from kan@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3514h6N047775 for perforce@freebsd.org; Sat, 5 Apr 2008 01:04:43 GMT (envelope-from kan@freebsd.org) Date: Sat, 5 Apr 2008 01:04:43 GMT Message-Id: <200804050104.m3514h6N047775@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kan@freebsd.org using -f From: Alexander Kabaev To: Perforce Change Reviews Cc: Subject: PERFORCE change 139391 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Apr 2008 01:04:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=139391 Change 139391 by kan@kan_mips32 on 2008/04/05 01:03:55 Restore change lost due to compat source move: o MIPS has no atomic_XXX_8 functions family Affected files ... .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/sys/atomic.h#2 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/sys/atomic.h#2 (text+ko) ==== @@ -44,7 +44,8 @@ extern uint8_t atomic_or_8_nv(volatile uint8_t *target, uint8_t value); extern void membar_producer(void); -#if defined(__sparc64__) || defined(__powerpc__) || defined(__arm__) +#if defined(__sparc64__) || defined(__powerpc__) || defined(__arm__) || \ + defined(__mips__) extern void atomic_or_8(volatile uint8_t *target, uint8_t value); #else static __inline void From owner-p4-projects@FreeBSD.ORG Sat Apr 5 01:45:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B84B01065672; Sat, 5 Apr 2008 01:45:26 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7A07C106566B for ; Sat, 5 Apr 2008 01:45:26 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 64BDC8FC16 for ; Sat, 5 Apr 2008 01:45:26 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m351jQ3u050892 for ; Sat, 5 Apr 2008 01:45:26 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m351jQs5050890 for perforce@freebsd.org; Sat, 5 Apr 2008 01:45:26 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 5 Apr 2008 01:45:26 GMT Message-Id: <200804050145.m351jQs5050890@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 139392 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Apr 2008 01:45:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=139392 Change 139392 by pgj@disznohal on 2008/04/05 01:45:10 Fix typos, translation, format. Submitted by: gabor (mentor) Affected files ... .. //depot/projects/docproj_hu/books/handbook/vinum/chapter.sgml#3 edit Differences ... ==== //depot/projects/docproj_hu/books/handbook/vinum/chapter.sgml#3 (text+ko) ==== @@ -18,7 +18,7 @@ Greg Lehey - Eredetileg írta: + Az eredeti változatot írta: @@ -56,7 +56,7 @@ alaprendszerében megtalálható egy blokkos eszközmeghajtóként a Vinum kötetkezelõ is, amellyel virtuális - lemezmeghajtókat lehet képezni. A tehát + lemezmeghajtókat lehet létrehozni. Tehát a Vinum egy olyan ún. kötetkezelõ, vagyis virtuális lemezkezelõ, ami az említett @@ -70,14 +70,13 @@ is. Ebben a fejezetben összefoglaljuk a hagyományos - lemezes tárolás jellegzetes - hátulütõit és bemutatjuk a Vinum - kötetkezelõt. + lemezes tárolás jellegzetes problémáit + és bemutatjuk a Vinum kötetkezelõt. A &os; 5-ös verziójától kezdve a - Vinumot újraírták a GEOM-nak megfelelõen - (), megtartva az eredeti + Vinumot újraírták a GEOM-nak + megfelelõen (), megtartva az eredeti elgondolásokat, elnevezéseket és a lemezen tárolt metaadatok formátumát. Ezt az újraírt változatot nevezik @@ -100,6 +99,7 @@ implementáció többé már nem is része az alaprendszernek. + @@ -112,23 +112,24 @@ A lemezek kapacitása ugyan növekszik, de - velük együtt a tárigények is. Gyakran - érezzük emiatt úgy, hogy a + velük együtt a tárigények is. + Ezért gyakran érezzük úgy, hogy a rendelkezésünkre álló lemezek tárkapacitását meghaladó állományrendszerre lenne szükségünk. Kétségtelen, hogy ez a probléma messze nem akkora jelentõségû, - mint mondjuk tíz évvel ezelõtt, de még - mindig fennáll. Egyes rendszerek ezt úgy - hidalták át, hogy létrehoztak egy olyan - absztrakt eszközt, amely az adatokat több lemezen + mint például tíz évvel ezelõtt, + de még mindig fennáll. Egyes rendszerek ezt + úgy hidalták át, hogy létrehoztak egy + olyan absztrakt eszközt, amely az adatokat több lemezen tárolja el. + - Szûk keresztmetszetek a - lemezhozzáférésben + A hozzáférési idõk szûk + keresztmetszetei Napjaink rendszerei szinte állandóan egyszerre több adathoz is hozzá akarnak férni. @@ -136,7 +137,7 @@ szerver több 100 Mbit/s sebességû kapcsolattal is csatlakozhat a világhálóhoz, amelyeken keresztül párhuzamosan többezernyi - adatforgalmat is folytathat, ami jelentõsen meghaladja a + tranzakciót is folytathat, ami jelentõsen meghaladja a legtöbb lemez átlagos átviteli sebességét. @@ -157,13 +158,13 @@ feldolgozással. Bármelyik kérést is vesszük, a - kiszolgáláshoz a meghajtónak elõször - a megfelelõ helyre kell tájolnia az + kiszolgáláshoz a meghajtónak + elõször a megfelelõ helyre kell mozgatnia az író/olvasó fejeket, meg kell várni a fej alatt elhaladó elsõ szektort, majd végrehajtani a megfelelõ mûveletet. Ezek a mûveletek szétválaszthatatlanok: semmi - értelme nincs megszakítani õket. + értelme nincs megszakítani ezeket. Tekintsünk egy átlagosnak mondható, nagyjából @@ -185,15 +186,16 @@ mennyiségétõl. A hagyományos és kézenfekvõ - megoldása ennek a problémának még - több cséve használata: egyetlen nagy - lemez helyett alkalmazzunk több kisebb, de azonos - tárkapacitású lemezt. Mindegyik lemez - képes egymástól függetlenül - mozgatni a fejeiket és az adatokat, aminek - köszönhetõen a tényleges adatátvitel - mértéke nagyjából a lemezek - számával arányosan növekszik. + megoldása ennek a problémának + még több cséve + használata: egyetlen nagy lemez helyett alkalmazzunk + több kisebb, de azonos tárkapacitású + lemezt. Mindegyik lemez képes egymástól + függetlenül mozgatni a fejeiket és az adatokat, + aminek köszönhetõen a tényleges + adatátvitel mértéke nagyjából a + lemezek számával arányosan + növekszik. Az adatátvitelben bekövetkezõ javulás pontos aránya természetesen kisebb, mint a lemezek @@ -204,23 +206,22 @@ elkerülhetetlen, hogy az egyik meghajtót nagyobb terhelés érje, mint a másikat. - - lemezek összefûzése - + lemezek + összefûzése Vinum összefûzés A lemezekre esõ terhelés egyenletessége - erõsen függ attól, hogyan osztjuk el az adatokat a - meghajtók között. Az itt használt - tárgyalásmódban a lemezen tárolt - adatokat egy könyv oldalaiként érdemes - elképzelni, vagyis rengeteg szám szerint - címezhetõ adatszektorként. A virtuális - lemezt ennek megfelelõen a legegyszerûbben úgy - tudjuk felosztani az egymás után következõ + erõsen függ attól, hogyan osztjuk el az adatokat + a meghajtók között. Az itt használt + példában a lemezen tárolt adatokat egy + könyv oldalaiként érdemes elképzelni, + vagyis rengeteg szám szerint címezhetõ + adatszektorként. A virtuális lemezt ennek + megfelelõen a legegyszerûbben úgy tudjuk + felosztani az egymás után következõ független fizikai lemezek mérete szerint és így használni, mintha egy nagy könyvet kisebb részekre téptünk volna. Ezt a módszert @@ -244,16 +245,12 @@ - - lemezcsíkozás - + lemezcsíkozás Vinum csíkozás - - RAID - + RAID Feloszthatjuk a virtuális lemezünket kisebb azonos méretû darabokra is, melyeket @@ -265,19 +262,18 @@ után az egész folyamat ismétlõdik, egészen az összes lemez megtöltéséig. Ezt a leképezést - csíkozásnak vagy - RAID-0-nak nevezzük. - - - A RAID jelentése: Olcsó - lemezek hibatûrõ tömbje (Redundant Array of - Inexpensive Disks). Különféle - típusú hibatûrési megoldásokat - vonultat fel, habár az eredeti elnevezés - félrevezetõ lehet, mivel redundanciát nem - tartalmaz. - - + csíkozásnak + (striping) vagy RAID-0-nak + nevezzük. + + A RAID jelentése: Olcsó + lemezek hibatûrõ tömbje (Redundant Array of + Inexpensive Disks). Különféle + típusú hibatûrési megoldásokat + vonultat fel, habár az eredeti elnevezés + félrevezetõ lehet, mivel redundanciát nem + tartalmaz. + A csíkozás használata során valamivel bonyolultabbá válik az adatok megtalálása és többletmunkát is @@ -301,35 +297,31 @@ A modern lemezhajtók utolsó fontos problémája, hogy nem eléggé megbízhatóak. Annak ellenére, hogy a lemezek - ezen a téren rettenetesen sokat fejlõdtek az + ezen a téren meglehetõsen sokat fejlõdtek az utóbbi pár évben, egy szervernek még - mindig azon központi részei, melyek a leginkább - hajlamosak a meghibásodásra. Amikor ez - bekövetkezik, a hatása akár egy + mindig ezek azok a központi részei, amelyek a + leginkább hajlamosak a meghibásodásra. + Amikor ez bekövetkezik, a hatása akár egy katasztrófával is felérhet: a sérült lemezmeghajtók cseréje és az adatok visszaállítása napokat is igénybe vehet. + lemeztükrözés - lemeztükrözés - - Vinum tükrözés - - RAID-1 - + RAID-1 Ennek a problémának a hagyományos megközelítése lenne a - tükrözés, vagyis amikor - ugyanarról az adatról tartunk két - példányt két eltérõ fizikai - hardveren. A RAID-szintek - beköszöntével ezt a technikát - RAID level 1-nak vagy + tükrözés + (mirroring), vagyis amikor ugyanarról az + adatról tartunk két példányt + két eltérõ fizikai hardveren. A + RAID-szintek beköszöntével ezt + a technikát RAID level 1-nak vagy RAID-1-nek is nevezik. Amikor írunk a kötetre, mindenhova írunk, az olvasás pedig bármelyik eszközrõl elvégezhetõ. @@ -343,8 +335,8 @@ Ár. Legalább kétszer annyiba - kerül, mint a nem redundánsan tároló - megoldások. + kerül, mint a nem redundánsan + tároló megoldások. @@ -359,16 +351,12 @@ + lemezparitás - lemezparitás - - Vinum paritás - - RAID-5 - + RAID-5 Az adatintegritás megõrzésére egy másik megoldás a paritás @@ -399,11 +387,11 @@ A RAID-5-nek a tükrözéshez - képest megvan az elõnye, hogy jelentõsen kevesebb - tárhelyet igényel. Az olvasás hasonló - a csíkozott szervezésekéhez, azonban az - írás jóval lassabb, közel 25%-a az - olvasás sebességének. Az egyik + képest megvan az az elõnye, hogy jelentõsen + kevesebb tárhelyet igényel. Az olvasás + hasonló a csíkozott szervezésekéhez, + azonban az írás jóval lassabb, közel + 25%-a az olvasás sebességének. Az egyik meghajtó meghibásodása esetén a tömb csökkentett módban még képes folytatni a mûködést: a fennmaradó @@ -412,6 +400,7 @@ meghajtóról olvasott adatokat folyamatosan javítani kell a többirõl származó segédinformációk szerint. + @@ -435,11 +424,11 @@ A kötetek erekbõl (plex) - állnak, melyek a kötet teljes területét - képviselik. Ennélfogva a hierarchia ezen - szintje nyújtja a redundanciát. Az ereket - legegyszerûbben a tükrözött tömbben - helyet foglaló lemezekként tudjuk + állnak, melyek a kötet teljes + területét képviselik. Ennélfogva a + hierarchia ezen szintje nyújtja a redundanciát. + Az ereket legegyszerûbben a tükrözött + tömbben helyet foglaló lemezekként tudjuk elképzelni, melyek ugyanazt az adatot tartalmazzák. @@ -479,19 +468,21 @@ A most következõ szakaszokban ismertetjük, hogy - ezek az objektumok milyen módon szolgáltatják a - Vinum részérõl elvárt + ezek az objektumok milyen módon szolgáltatják + a Vinum részérõl elvárt funkciókat. A kötetek mérete + Az erek képesek a Vinum konfigurációjában található több különbözõ meghajtón - elhelyezkedõ allemezt is nyalábolni. Ennek - következményeképpen az egyes meghajtók - mérete nem korlátozza az erek + elhelyezkedõ allemezeket is nyalábba kötni. + Ennek következményeképpen az egyes + meghajtók mérete nem korlátozza az erek méretét, emiatt a kötetét sem. + @@ -508,12 +499,14 @@ adatát ábrázolja, elõfordulhat olyan eset, hogy bizonyos részei hiányoznak fizikai, kialakítási (nem társítottunk - allemezeket hozzájuk) okokból adódoan vagy - véletlenül (a hozzátartozó - lemezterületek sérültek). Amíg - legalább egy ér képes a kötet teljes - tartalmát szolgáltatni, addig a kötet - teljesen épnek tekinthetõ. + allemezeket hozzájuk) okokból + adódóan vagy véletlenül (a + hozzátartozó lemezterületek + sérültek). Amíg legalább egy + ér képes a kötet teljes tartalmát + szolgáltatni, addig a kötet teljesen épnek + tekinthetõ. + @@ -539,19 +532,21 @@ összefûzött értõl. + Hogyan szervezzük az ereket? + A &os; &rel.current; verziójában két fajta erezési megoldást találhatunk: Az összefûzött erek a legrugalmasabbak: - tetszõleges számú allemezt tartalmazhatnak, - az allemezek mérete pedig eltérhet. Az - ér újabb allemezek + tetszõleges számú allemezt + tartalmazhatnak, az allemezek mérete pedig + eltérhet. Az ér újabb allemezek hozzáadásával tovább bõvíthetõ. Kevesebb processzoridõt igényel, mint egy csíkozott ér, @@ -578,7 +573,7 @@ egyezniük a méretüknek, illetve az érhez annyira bonyolult újabb allemezeket kapcsolni, hogy a Vinum jelenleg nem is képes - rá. Ezeken felül a Vinum még + rá. Ezeken kívü a Vinum még támaszt egy triviális igényt is: a csíkozott érben legalább két allemeznek lennie kell, mivel másképp nem @@ -628,6 +623,7 @@ + @@ -655,6 +651,7 @@ A konfigurációs állomány + A konfigurációs állomány írja le az egyes objektumokat. Egy egyszerûbb kötet definíciója így nézhet @@ -671,8 +668,8 @@ - A drive kezdetû sor adja meg - az lemez partícióját + A drive kezdetû sor adja meg a + lemez partícióját (meghajtóját) és a hardveren levõ elhelyezkedését. Az a szimbolikus nevet kapta. A @@ -757,8 +754,8 @@ Ezen és az ezt követõ ábrán - egy kötetet láthatunk, amely ereket tartalmaz, amelyek - pedig allemezeket. Ebben a pofonegyszerû + egy kötetet láthatunk, amely ereket tartalmaz, + amelyek pedig allemezeket. Ebben az alapvetõ példában a kötet egyetlen eret tartalmaz, amiben pedig egyetlen allemez van. @@ -772,6 +769,7 @@ következõ szakaszokban sokkal érdekesebb konfigurációs módszereket is illusztrálunk. + @@ -779,12 +777,12 @@ tükrözés A kötetek rugalmassága - tükrözéssel növelhetõ. Egy - tükrözött kötet kiosztása során - feltétlenül gondoskodnunk kell arról, hogy az - egyes erekhez tartozó allemezek eltérõ - meghajtókon találhatóak, így az - esetleges meghibásodások nem + tükrözéssel növelhetõ. Egy + tükrözött kötet kiosztása + során feltétlenül gondoskodnunk kell + arról, hogy az egyes erekhez tartozó allemezek + eltérõ meghajtókon találhatóak, + így az esetleges meghibásodások nem károsítják mind a két eret. Az alábbi konfigurációban egy kötetet tükrözünk: @@ -798,12 +796,12 @@ sd length 512m drive b Ebben a példában már nem kellett - újra megadnunk az a meghajtót, - mivel a Vinum figyelemmel kíséri az összes - objektumot a saját konfigurációs - adatbázisában. A definíció - feldolgozása után a konfiguráció - így fog kinézni: + újra megadnunk az a + meghajtót, mivel a Vinum figyelemmel kíséri + az összes objektumot a saját + konfigurációs adatbázisában. A + definíció feldolgozása után a + konfiguráció így fog kinézni: Drives: 2 (4 configured) @@ -839,6 +837,7 @@ a teljes 512 MB-os területet. Ahogy a korábbi példa esetén, itt is mindegyik ér csak egyetlen allemezt tartalmaz. + @@ -884,21 +883,21 @@ Volumes: 3 (4 configured) Plexes: 4 (8 configured) Subdisks: 7 (16 configured) - + D a State: up Device /dev/da3h Avail: 1421/2573 MB (55%) D b State: up Device /dev/da4h Avail: 1933/2573 MB (75%) D c State: up Device /dev/da5h Avail: 2445/2573 MB (95%) D d State: up Device /dev/da6h Avail: 2445/2573 MB (95%) - + V myvol State: up Plexes: 1 Size: 512 MB V mirror State: up Plexes: 2 Size: 512 MB V striped State: up Plexes: 1 Size: 512 MB - + P myvol.p0 C State: up Subdisks: 1 Size: 512 MB P mirror.p0 C State: up Subdisks: 1 Size: 512 MB P mirror.p1 C State: initializing Subdisks: 1 Size: 512 MB P striped.p1 State: up Subdisks: 1 Size: 512 MB - + S myvol.p0.s0 State: up PO: 0 B Size: 512 MB S mirror.p0.s0 State: up PO: 0 B Size: 512 MB S mirror.p1.s0 State: empty PO: 0 B Size: 512 MB @@ -914,11 +913,12 @@ - Ez a kötet a + Ez a kötet a ban látható. A csíkok sötétedése jelzi a helyüket az ér területében: a világosabbak elöl, a sötétebbek hátul szerepelnek. + @@ -966,6 +966,7 @@ + @@ -974,7 +975,7 @@ Korábban már megismerhettük, hogy a Vinum alapértelmezett neveket társít az erekhez - és allemezekhez, habár ezek a nevek + és az allemezekhez, habár ezek a nevek felülbírálhatóak. Ez viszont egyáltalán nem ajánlott, mivel már a VERITAS kötetkezelõ, ahol tetszõleges neveket @@ -987,11 +988,11 @@ karaktert, azonban érdemes inkább csak betûket, számjegyeket és az aláhúzást használni. A kötetek, erek és allemezek nevei - egészen 64 karakteresek lehetnek, míg a - meghajtók nevei pedig 32 karakteresek. + akár 64 karakteresek is lehetnek, a meghajtók nevei + pedig 32 karakteresek. A Vinum objektumai a /dev/gvinum - könyvtáron belül levõ hierarchiában + könyvtáron belüli hierarchiában helyezkednek el eszközleírókként. Az imént említett példakonfiguráció hatására a @@ -1000,21 +1001,23 @@ - Ez csak a Vinum elavult - implementációjára vonatkozik. + + Ez a rész csak a Vinum korábbi, elavult + implementációjára vonatkozik. + A /dev/vinum/control és /dev/vinum/controld nevû vezérlõeszközök, melyeket a - &man.gvinum.8; és a Vinum daemon használ. + &man.gvinum.8; és a Vinum démon + használ. - Mindegyik kötethez egy - eszközleíró. Ezek a Vinum - számára a központi eszközök. - Ezért az elõbbi konfiguráció - révén megjelennek a + Mindegyik kötethez egy eszközleíró + tartozik. Ezek a Vinum számára a központi + eszközök, ezért az elõbbi + konfiguráció révén megjelennek a /dev/gvinum/myvol, /dev/gvinum/mirror, /dev/gvinum/striped, @@ -1024,19 +1027,21 @@ - Ez csak a Vinum elavult - implementációjára vonatkozik. + + Ez a rész csak a Vinum korábbi, elavult + implementációjára vonatkozik. + - Leírók a - /dev/vinum/drive könyvtárban az - egyes meghajtókhoz. Ezek valójában - szimbolikus linkek a megfelelõ lemezes - eszközökre. + Az egyes meghajtókhoz tartozó + leírók a /dev/vinum/drive + könyvtárban találhatóak. Ezek + valójában szimbolikus linkek a megfelelõ + lemezes eszközökre. - Közvetlen leírók minden kötethez a - /dev/gvinum/ + Minden kötethez közvetlen leírók + tartoznak /dev/gvinum/ könyvtárban. @@ -1044,8 +1049,8 @@ Az egyes erek és allemezek eszközleírói a /dev/gvinum/plex és - /dev/gvinum/sd - könyvtárakban. + /dev/gvinum/sd könyvtárakban + jelennek meg. @@ -1065,9 +1070,9 @@ sd length 100m drive drive4 Az állomány feldolgozása után az - eszközleírókat a &man.gvinum.8; az alábbi - módon szervezi a /dev/gvinum - könyvtárban: + eszközleírókat a &man.gvinum.8; az + alábbi módon szervezi a + /dev/gvinum könyvtárban: drwxr-xr-x 2 root wheel 512 Apr 13 16:46 plex @@ -1091,7 +1096,7 @@ megoldhatóvá válik, hogy az egyes meghajtók automatikusan felismerhetõek legyenek abban az esetben is, amikor fizikailag áthelyezzük - õket. A meghajtók nevei legfeljebb 32 karakteresek + ezeket. A meghajtók nevei legfeljebb 32 karakteresek lehetnek. @@ -1122,8 +1127,8 @@ partíció nevével. Hétköznapi esetben a &man.newfs.8; - megpróbálja a lemez nevét értelmezni, - és panaszkodik, ha nem sikerül. + megpróbálja a lemez nevét + értelmezni, és panaszkodik, ha nem sikerül. Például: &prompt.root; newfs /dev/gvinum/concat @@ -1135,12 +1140,15 @@ &prompt.root; newfs /dev/gvinum/concat - A &os; 5.0 elõtt verzióiban a - &man.newfs.8; parancsnak a régi elnevezési - séma használata mellett még át kell - adni egy -v kapcsolót is: + + A &os; 5.0 elõtt verzióiban a &man.newfs.8; + parancsnak a régi elnevezési séma + használata mellett még át kell adni egy + -v kapcsolót is: + &prompt.root; newfs -v /dev/vinum/concat + @@ -1209,11 +1217,13 @@ Automatikus indítás - Ez a rész csak a Vinum elavult - implementációjára vonatkozik. A - Gvinum mindig automatikusan elindul a - hozzátartozó modul - betöltésével együtt. + + Ez a rész csak a Vinum elavult + implementációjára vonatkozik. A + Gvinum mindig automatikusan elindul a + hozzátartozó modul + betöltésével együtt. + A Vinum rendszerindítás során történõ automatikus @@ -1237,7 +1247,7 @@ található állományrendszereket a rendszer automatikusan át tudja vizsgálni az &man.fsck.8; segítségével, majd - csatlakoztatni õket. + csatlakoztatja ezeket. Amikor a Vinumot a vinum start paranccsal indítjuk el, a Vinum beolvassa a @@ -1256,6 +1266,7 @@ található adatbázispéldányokat szinkronizálja ehhez a változathoz. + @@ -1302,9 +1313,9 @@ használt állományrendszert tartalmazó Vinum-kötetre. Ennek megfelelõen valószínûleg jó ötlet a - "root"-nak nevezni ezt a kötetet, - habár technikai szempontból ezt semmi nem - követeli meg. Az itt felsorakozó + "root" névvel azonosítani ezt a + kötetet, habár technikai szempontból ezt semmi + nem követeli meg. Az itt felsorakozó példákban azonban ezt a nevet fogjuk használni. @@ -1316,9 +1327,9 @@ - A rendszermagnak már el tudnia érnie a - Vinumot a rendszerindítás során. Emiatt - a ban leírt + A rendszermagnak már el kell érnie a + Vinumot a rendszerindítás során. + Emiatt a ban leírt automatikus indítási módszer nem alkalmazható erre a feladatra, és a start_vinum paramétert @@ -1339,19 +1350,21 @@ - A Gvinum használata - során az összes többi - beállítás automatikusan - végrehajtódik, amint a modul - betöltõdik, ezért ilyenkor csak a fentebb - leírt eljárásra van - szükség. Az itt felsoroltak csak az elavult - Vinum implementációra vonatkoznak, - csupán a régebbi típusú - rendszerek kedvéért említjük - meg. + + A Gvinum használata + során az összes többi + beállítás automatikusan + végrehajtódik, amint a modul + betöltõdik, ezért ilyenkor csak a fentebb + leírt eljárásra van + szükség. Az itt felsoroltak csak az elavult + Vinum implementációra vonatkoznak, + csupán a régebbi típusú + rendszerek kedvéért említjük + meg. + - A Vinumot nagyon korán éltre kell + A Vinumot nagyon korán életre kell keltenünk, hiszen a rendszerindításhoz használt állományrendszert tartalmazó kötetet kell @@ -1363,12 +1376,15 @@ valamelyik rendszerindító szkript) ki nem adja a vinum start parancsot. - A most következõ bekezdés a &os; - 5.X és az azutáni rendszerek esetén - mutatja be a szükséges lépéseket. - A &os; 4.X verziója esetén máshogy kell - elvégezni a beállításokat, amit - a mutat be. + + A most következõ bekezdés a &os; 5.X + és az azutáni rendszerek esetén + mutatja be a szükséges + lépéseket. A &os; 4.X verziója + esetén máshogy kell elvégezni a + beállításokat, amit a mutat be. + A @@ -1398,6 +1414,7 @@ leképzéséhez. + @@ -1408,17 +1425,17 @@ Mivel a jelenlegi &os; rendszertöltõ csak 7,5 KB méretû és egyébként is csak az UFS állományrendszerrõl tud - állományokat beolvasni (mint mondjuk a - /boot/loadert), teljesen lehetetlen + állományokat beolvasni (mint például + a /boot/loadert), teljesen lehetetlen még a Vinum belsõ szerkezetére is megtanítani, tehát a Vinum-konfigurációk értelmezésére és magának a rendszerindító kötet elemeinek - kimazsolázására. Ezért be kell - vetnünk néhány trükköt ahhoz, hogy - a rendszerindító kód számára - a rendszerindításhoz használható + kielemzésére. Ezért be kell vetnünk + néhány trükköt ahhoz, hogy a + rendszerindító kód számára a + rendszerindításhoz használható szabványos "a" partíció képzetét keltsük. @@ -1473,8 +1490,8 @@ A rendszerindító kötet részeként megjelenõ eszközön - található allemez helyét (az eszköz - elejétõl számított + található allemez helyét (az + eszköz elejétõl számított eltolását) és méretét ellenõrizni kell az alábbi parancs segítségével: @@ -1482,11 +1499,11 @@ &prompt.root; gvinum l -rv root Ne felejtsük el, hogy a Vinum az eltolásokat - és méreteket byte-okban méri. + és méreteket bájtokban méri. Ezekbõl tehát úgy nyerünk a bsdlabel használatához - szükséges blokkszámokat, ha elosztjuk - õket 512-vel. + szükséges blokkszámokat, ha ezeket + elosztjuk 512-vel. @@ -1499,13 +1516,14 @@ kialakításában. Az eszköznév legyen a slice (fdisk)-táblát nem tartalmazó - lemezek esetén a lemez neve (mint mondjuk - da0), vagy ellenkezõ esetben a - slice neve (pl. ad0s1). + lemezek esetén a lemez neve (mint + például da0), vagy + ellenkezõ esetben a slice neve (pl. + ad0s1). Ha már lenne egy "a" partíció az eszközön - (gyaníthatóan egy Vinum elõtti + (valószínûleg egy Vinum elõtti rendszeríndító állományrendszert tartalmaz), nevezzük át valami másra és így @@ -1514,8 +1532,8 @@ rendszer számára alapértelmezett rendszerindító eszköz. Azonban vegyük észre, hogy az aktív - partíciók (mint mondjuk az éppen - csatlakoztatott rendszerindító + partíciók (mint például az + éppen csatlakoztatott rendszerindító állományrendszer) nem nevezhetõek át, ezért ezt a lépést csak akkor tudjuk megtenni, ha a rendszerünket egy @@ -1540,8 +1558,8 @@ 4.2BSD. Az "fsize", "bsize" és "cpg" értékeket a jelenlegi - állományrendszerhez mértéken - illendõ megválasztani, azonban itt most + állományrendszerhez mérten + ajánlott megválasztani, azonban itt most egyáltalán nem bírnak jelentõséggel. @@ -1585,19 +1603,19 @@ ellenõriznünk. A következõ indítás során a - rendszertöltõ már az új Vinum-alapú - rendszerindító + rendszertöltõ már az új + Vinum-alapú rendszerindító állományrendszerrõl fogja összeszedni a mûködéséhez szükséges adatokat és ezeknek megfelelõen cselekedni. - Végül, a rendszermag - inicializálódásának - végén, mikor az összes eszközt - felismerte, egy ehhez hasonló feltûnõ - üzenet fogja jelezni a beállítás + Végül, a rendszermag inicializálója + után, mikor az összes eszközt felismerte, egy + ehhez hasonló feltûnõ üzenet fogja jelezni + a beállítás sikerességét: Mounting root from ufs:/dev/gvinum/root + @@ -1605,9 +1623,9 @@ állományrendszer példája Miután sikeresen konfiguráltuk a - rendszerindító Vinum-kötetet, a gvinum - l -rv root kimenete nagyjából így - fog kinézni: + rendszerindító Vinum-kötetet, a + gvinum l -rv root kimenete + nagyjából így fog kinézni: ... @@ -1629,9 +1647,10 @@ 135680-as eltoltás értékekre kell figyelnünk. Ez képzõdik le a bsdlabel fogalmi - rendszerében aztán 265 darab 512 byte-os blokkra a - lemezen. Ehhez hasonlóan a rendszerindító - kötet mérete 245760 darab 512 byte-os blokk lesz. A + rendszerében aztán 265 darab 512 bájtos + blokkra a lemezen. Ehhez hasonlóan a + rendszerindító kötet mérete 245760 + darab 512 bájtos blokk lesz. A rendszerindító kötet másodpéldányát tartalmazó /dev/da1h ugyanilyen @@ -1650,9 +1669,9 @@ Megfigyelhetõ, hogy a hamis "a" - partíció "size" paraméter - értéke megegyezik a fentebb becsült - értékkel, miközben az >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Apr 5 01:50:32 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 01C861065674; Sat, 5 Apr 2008 01:50:32 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B80251065671 for ; Sat, 5 Apr 2008 01:50:31 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A4B178FC12 for ; Sat, 5 Apr 2008 01:50:31 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m351oVGa051046 for ; Sat, 5 Apr 2008 01:50:31 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m351oVl7051044 for perforce@freebsd.org; Sat, 5 Apr 2008 01:50:31 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 5 Apr 2008 01:50:31 GMT Message-Id: <200804050150.m351oVl7051044@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 139393 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Apr 2008 01:50:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=139393 Change 139393 by pgj@disznohal on 2008/04/05 01:50:19 (geom) MFen: 1.40 --> 1.41 Affected files ... .. //depot/projects/docproj_hu/books/handbook/geom/chapter.sgml#8 edit Differences ... ==== //depot/projects/docproj_hu/books/handbook/geom/chapter.sgml#8 (text+ko) ==== @@ -1,11 +1,11 @@ + Original Revision: 1.41 --> @@ -693,7 +693,7 @@ class="directory">/dev könyvtáron belül. Például az UFS2 állományrendszer-címkék a /dev/ufs2 könyvtárban + class="directory">/dev/ufs könyvtárban keletkeznek. Egy általános címke a @@ -726,11 +726,11 @@ Ezután egy címkének kell megjelennie a - /dev/ufs2 + /dev/ufs könyvtárban, amelyet vegyünk is fel az /etc/fstab állományba: - /dev/ufs2/home /home ufs rw 2 2 + /dev/ufs/home /home ufs rw 2 2 Az állományrendszert tilos csatolni a From owner-p4-projects@FreeBSD.ORG Sat Apr 5 01:58:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C3FFB106567E; Sat, 5 Apr 2008 01:58:47 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6DFCD106567A for ; Sat, 5 Apr 2008 01:58:47 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5A4CB8FC13 for ; Sat, 5 Apr 2008 01:58:47 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m351wluP051287 for ; Sat, 5 Apr 2008 01:58:47 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m351wlBr051285 for perforce@freebsd.org; Sat, 5 Apr 2008 01:58:47 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 5 Apr 2008 01:58:47 GMT Message-Id: <200804050158.m351wlBr051285@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 139394 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Apr 2008 01:58:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=139394 Change 139394 by pgj@disznohal on 2008/04/05 01:58:46 (printing) MFen: 1.110 --> 1.111 Affected files ... .. //depot/projects/docproj_hu/books/handbook/printing/chapter.sgml#5 edit Differences ... ==== //depot/projects/docproj_hu/books/handbook/printing/chapter.sgml#5 (text+ko) ==== @@ -1,12 +1,12 @@ + Original Revision: 1.111 --> @@ -3080,8 +3080,8 @@ LaserJet/PCL-re alakító programra. A &os; Portgyûjteményében (ld. A Portgyûjtemény) - találunk is egyet: a csomag neve - dvi2xx. A csomag + találunk is egyet: a csomag neve print/dvi2xx. A csomag telepítésével megkapjunk a nekünk kellõ dvilj2p programot, ami képes DVI-t LaserJet IIp, LaserJet III és a From owner-p4-projects@FreeBSD.ORG Sat Apr 5 02:04:54 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2CF8F1065673; Sat, 5 Apr 2008 02:04:54 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E3DE4106566B for ; Sat, 5 Apr 2008 02:04:53 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D1FF78FC0A for ; Sat, 5 Apr 2008 02:04:53 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3524rY1054709 for ; Sat, 5 Apr 2008 02:04:53 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3524rf6054707 for perforce@freebsd.org; Sat, 5 Apr 2008 02:04:53 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 5 Apr 2008 02:04:53 GMT Message-Id: <200804050204.m3524rf6054707@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 139395 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Apr 2008 02:04:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=139395 Change 139395 by pgj@disznohal on 2008/04/05 02:04:01 (ports) MFen: 1.278 --> 1.279 Affected files ... .. //depot/projects/docproj_hu/books/handbook/ports/chapter.sgml#6 edit Differences ... ==== //depot/projects/docproj_hu/books/handbook/ports/chapter.sgml#6 (text+ko) ==== @@ -1,12 +1,12 @@ + Original Revision: 1.279 --> Alkalmazások telepítése: csomagok From owner-p4-projects@FreeBSD.ORG Sat Apr 5 02:07:57 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9DCF31065671; Sat, 5 Apr 2008 02:07:57 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 602B8106566C for <perforce@freebsd.org>; Sat, 5 Apr 2008 02:07:57 +0000 (UTC) (envelope-from kan@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4E9FB8FC17 for <perforce@freebsd.org>; Sat, 5 Apr 2008 02:07:57 +0000 (UTC) (envelope-from kan@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3527vW4054851 for <perforce@freebsd.org>; Sat, 5 Apr 2008 02:07:57 GMT (envelope-from kan@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3527vfs054849 for perforce@freebsd.org; Sat, 5 Apr 2008 02:07:57 GMT (envelope-from kan@freebsd.org) Date: Sat, 5 Apr 2008 02:07:57 GMT Message-Id: <200804050207.m3527vfs054849@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kan@freebsd.org using -f From: Alexander Kabaev <kan@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Cc: Subject: PERFORCE change 139396 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 05 Apr 2008 02:07:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=139396 Change 139396 by kan@kan_mips32 on 2008/04/05 02:06:59 Restore change lost due to compat source move: o MIPS has no atomic_XXX_8 functions family Affected files ... .. //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#2 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#2 (text+ko) ==== @@ -74,7 +74,8 @@ return (newval); } -#if defined(__sparc64__) || defined(__powerpc__) || defined(__arm__) +#if defined(__sparc64__) || defined(__powerpc__) || defined(__arm__) || \ + defined(__mips__) void atomic_or_8(volatile uint8_t *target, uint8_t value) { From owner-p4-projects@FreeBSD.ORG Sat Apr 5 07:26:44 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1881F1065671; Sat, 5 Apr 2008 07:26:44 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CD232106564A for <perforce@FreeBSD.org>; Sat, 5 Apr 2008 07:26:43 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A960D8FC15 for <perforce@FreeBSD.org>; Sat, 5 Apr 2008 07:26:43 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m357QhqF082072 for <perforce@FreeBSD.org>; Sat, 5 Apr 2008 07:26:43 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m357QdJt082069 for perforce@freebsd.org; Sat, 5 Apr 2008 07:26:39 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sat, 5 Apr 2008 07:26:39 GMT Message-Id: <200804050726.m357QdJt082069@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky <rdivacky@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Cc: Subject: PERFORCE change 139400 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 05 Apr 2008 07:26:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=139400 Change 139400 by rdivacky@rdivacky_witten on 2008/04/05 07:26:06 IFC Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/amd64/busdma_machdep.c#6 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/db_trace.c#5 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/exception.S#4 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/genassym.c#9 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/identcpu.c#6 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/intr_machdep.c#10 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/local_apic.c#10 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/machdep.c#18 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/mp_watchdog.c#3 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/msi.c#6 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/nexus.c#9 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/pmap.c#10 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/prof_machdep.c#5 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/stack_machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/amd64/amd64/trap.c#8 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/vm_machdep.c#4 integrate .. //depot/projects/linuxolator/src/sys/amd64/conf/DEFAULTS#5 integrate .. //depot/projects/linuxolator/src/sys/amd64/conf/GENERIC#12 integrate .. //depot/projects/linuxolator/src/sys/amd64/conf/GENERIC.hints#3 integrate .. //depot/projects/linuxolator/src/sys/amd64/conf/NOTES#8 integrate .. //depot/projects/linuxolator/src/sys/amd64/include/clock.h#4 integrate .. //depot/projects/linuxolator/src/sys/amd64/include/ieeefp.h#2 integrate .. //depot/projects/linuxolator/src/sys/amd64/include/pc/bios.h#2 integrate .. //depot/projects/linuxolator/src/sys/amd64/include/pci_cfgreg.h#2 integrate .. //depot/projects/linuxolator/src/sys/amd64/include/pmap.h#5 integrate .. //depot/projects/linuxolator/src/sys/amd64/include/pmc_mdep.h#2 integrate .. //depot/projects/linuxolator/src/sys/amd64/include/specialreg.h#6 integrate .. //depot/projects/linuxolator/src/sys/amd64/include/stack.h#1 branch .. //depot/projects/linuxolator/src/sys/amd64/include/vmparam.h#3 integrate .. //depot/projects/linuxolator/src/sys/amd64/isa/clock.c#7 integrate .. //depot/projects/linuxolator/src/sys/amd64/pci/pci_cfgreg.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/bcopy_page.S#2 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/bcopyinout.S#2 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/busdma_machdep.c#5 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/cpufunc.c#7 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/cpufunc_asm_arm11.S#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/cpufunc_asm_armv5.S#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/cpufunc_asm_armv5_ec.S#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/db_trace.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/identcpu.c#5 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/in_cksum_arm.S#2 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/nexus_io.c#4 delete .. //depot/projects/linuxolator/src/sys/arm/arm/nexus_io_asm.S#2 delete .. //depot/projects/linuxolator/src/sys/arm/arm/pmap.c#8 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/stack_machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/support.S#3 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/swtch.S#3 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/trap.c#6 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/vm_machdep.c#6 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/at91.c#6 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/at91_mcireg.h#2 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/at91rm92reg.h#3 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/if_ate.c#9 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/kb920x_machdep.c#8 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/ohci_atmelarm.c#4 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/std.at91#3 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/std.kb920x#3 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#4 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/uart_dev_at91usart.c#5 integrate .. //depot/projects/linuxolator/src/sys/arm/conf/AVILA#4 integrate .. //depot/projects/linuxolator/src/sys/arm/conf/BWCT#2 integrate .. //depot/projects/linuxolator/src/sys/arm/conf/CRB#2 integrate .. //depot/projects/linuxolator/src/sys/arm/conf/EP80219#5 integrate .. //depot/projects/linuxolator/src/sys/arm/conf/HL200#1 branch .. //depot/projects/linuxolator/src/sys/arm/conf/IQ31244#4 integrate .. //depot/projects/linuxolator/src/sys/arm/conf/KB920X#5 integrate .. //depot/projects/linuxolator/src/sys/arm/conf/SIMICS#4 integrate .. //depot/projects/linuxolator/src/sys/arm/conf/SKYEYE#3 integrate .. //depot/projects/linuxolator/src/sys/arm/include/armreg.h#4 integrate .. //depot/projects/linuxolator/src/sys/arm/include/asm.h#3 integrate .. //depot/projects/linuxolator/src/sys/arm/include/asmacros.h#3 integrate .. //depot/projects/linuxolator/src/sys/arm/include/atomic.h#4 integrate .. //depot/projects/linuxolator/src/sys/arm/include/cpuconf.h#4 integrate .. //depot/projects/linuxolator/src/sys/arm/include/cpufunc.h#5 integrate .. //depot/projects/linuxolator/src/sys/arm/include/pmc_mdep.h#2 integrate .. //depot/projects/linuxolator/src/sys/arm/include/stack.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/vmparam.h#3 integrate .. //depot/projects/linuxolator/src/sys/arm/sa11x0/assabet_machdep.c#5 integrate .. //depot/projects/linuxolator/src/sys/arm/sa11x0/files.sa11x0#2 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/i80321/ep80219_machdep.c#6 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/i80321/iq31244_machdep.c#6 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/i8134x/crb_machdep.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/avila_machdep.c#5 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/if_npe.c#7 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixp425_qmgr.c#3 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/boot2/boot2.c#7 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/boot2/bwct_board.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/eeprom.c#3 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/emac.c#7 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/emac_init.c#5 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/lib.h#4 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/spi_flash.c#5 integrate .. //depot/projects/linuxolator/src/sys/boot/common/loader.8#6 integrate .. //depot/projects/linuxolator/src/sys/boot/common/ufsread.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/ficl/Makefile#3 integrate .. //depot/projects/linuxolator/src/sys/boot/forth/support.4th#3 integrate .. //depot/projects/linuxolator/src/sys/boot/i386/Makefile#3 integrate .. //depot/projects/linuxolator/src/sys/boot/i386/boot2/boot2.c#5 integrate .. //depot/projects/linuxolator/src/sys/boot/i386/cdboot/cdboot.s#3 integrate .. //depot/projects/linuxolator/src/sys/boot/i386/gptboot/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/gptboot/gptboot.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/gptboot/gptldr.S#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/libi386/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/boot/i386/libi386/bioscd.c#3 integrate .. //depot/projects/linuxolator/src/sys/boot/i386/libi386/biosdisk.c#3 integrate .. //depot/projects/linuxolator/src/sys/boot/i386/libi386/biosmem.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/i386/libi386/biossmap.c#4 integrate .. //depot/projects/linuxolator/src/sys/boot/i386/libi386/devicename.c#3 integrate .. //depot/projects/linuxolator/src/sys/boot/i386/libi386/pxe.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/i386/loader/main.c#5 integrate .. //depot/projects/linuxolator/src/sys/boot/i386/pmbr/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/pmbr/pmbr.s#1 branch .. //depot/projects/linuxolator/src/sys/boot/pc98/Makefile.inc#2 integrate .. //depot/projects/linuxolator/src/sys/boot/pc98/boot2/boot.c#5 integrate .. //depot/projects/linuxolator/src/sys/boot/pc98/cdboot/cdboot.s#3 integrate .. //depot/projects/linuxolator/src/sys/boot/pc98/libpc98/bioscd.c#3 integrate .. //depot/projects/linuxolator/src/sys/boot/pc98/libpc98/biosdisk.c#3 integrate .. //depot/projects/linuxolator/src/sys/boot/pc98/loader/main.c#3 integrate .. //depot/projects/linuxolator/src/sys/boot/powerpc/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/boot/powerpc/loader/Makefile#2 delete .. //depot/projects/linuxolator/src/sys/boot/powerpc/loader/conf.c#2 delete .. //depot/projects/linuxolator/src/sys/boot/powerpc/loader/help.ofw#2 delete .. //depot/projects/linuxolator/src/sys/boot/powerpc/loader/ldscript.powerpc#2 delete .. //depot/projects/linuxolator/src/sys/boot/powerpc/loader/metadata.c#2 delete .. //depot/projects/linuxolator/src/sys/boot/powerpc/loader/start.c#2 delete .. //depot/projects/linuxolator/src/sys/boot/powerpc/loader/version#2 delete .. //depot/projects/linuxolator/src/sys/boot/powerpc/ofw/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/boot/powerpc/ofw/conf.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/powerpc/ofw/help.ofw#1 branch .. //depot/projects/linuxolator/src/sys/boot/powerpc/ofw/ldscript.powerpc#1 branch .. //depot/projects/linuxolator/src/sys/boot/powerpc/ofw/metadata.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/powerpc/ofw/start.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/powerpc/ofw/version#1 branch .. //depot/projects/linuxolator/src/sys/bsm/audit.h#5 integrate .. //depot/projects/linuxolator/src/sys/cam/cam_xpt.c#11 integrate .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_all.h#4 integrate .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_da.c#12 integrate .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_low.h#2 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32.h#3 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_ipc.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_misc.c#10 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_proto.h#12 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_syscall.h#12 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_syscalls.c#12 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_sysent.c#12 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/syscalls.master#11 integrate .. //depot/projects/linuxolator/src/sys/compat/linprocfs/linprocfs.c#19 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_file.c#27 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_getcwd.c#5 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_ioctl.c#5 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_ioctl.h#6 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#67 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_stats.c#15 integrate .. //depot/projects/linuxolator/src/sys/compat/ndis/ndis_var.h#3 integrate .. //depot/projects/linuxolator/src/sys/compat/ndis/ntoskrnl_var.h#2 integrate .. //depot/projects/linuxolator/src/sys/compat/ndis/subr_ndis.c#6 integrate .. //depot/projects/linuxolator/src/sys/compat/ndis/subr_ntoskrnl.c#4 integrate .. //depot/projects/linuxolator/src/sys/compat/opensolaris/kern/opensolaris_kobj.c#4 integrate .. //depot/projects/linuxolator/src/sys/compat/opensolaris/kern/opensolaris_vfs.c#4 integrate .. //depot/projects/linuxolator/src/sys/compat/opensolaris/rpc/xdr.h#2 integrate .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/atomic.h#2 integrate .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/bitmap.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/cpupart.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/cpuvar.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/cyclic.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/elf.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/kcondvar.h#2 integrate .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/kmem.h#3 integrate .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/mman.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/modctl.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/mutex.h#4 integrate .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/objfs.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/param.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/pcpu.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/proc.h#3 integrate .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/rwlock.h#4 integrate .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/stat.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/time.h#2 integrate .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/types.h#3 integrate .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/vnode.h#3 integrate .. //depot/projects/linuxolator/src/sys/compat/pecoff/imgact_pecoff.c#3 integrate .. //depot/projects/linuxolator/src/sys/compat/svr4/imgact_svr4.c#2 integrate .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_fcntl.c#8 integrate .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_misc.c#5 integrate .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_stream.c#2 integrate .. //depot/projects/linuxolator/src/sys/conf/Makefile.amd64#3 integrate .. //depot/projects/linuxolator/src/sys/conf/NOTES#26 integrate .. //depot/projects/linuxolator/src/sys/conf/files#29 integrate .. //depot/projects/linuxolator/src/sys/conf/files.amd64#13 integrate .. //depot/projects/linuxolator/src/sys/conf/files.arm#6 integrate .. //depot/projects/linuxolator/src/sys/conf/files.i386#12 integrate .. //depot/projects/linuxolator/src/sys/conf/files.ia64#5 integrate .. //depot/projects/linuxolator/src/sys/conf/files.pc98#10 integrate .. //depot/projects/linuxolator/src/sys/conf/files.powerpc#7 integrate .. //depot/projects/linuxolator/src/sys/conf/files.sparc64#9 integrate .. //depot/projects/linuxolator/src/sys/conf/files.sun4v#9 integrate .. //depot/projects/linuxolator/src/sys/conf/kmod.mk#8 integrate .. //depot/projects/linuxolator/src/sys/conf/newvers.sh#2 integrate .. //depot/projects/linuxolator/src/sys/conf/options#25 integrate .. //depot/projects/linuxolator/src/sys/conf/options.amd64#4 integrate .. //depot/projects/linuxolator/src/sys/conf/options.arm#6 integrate .. //depot/projects/linuxolator/src/sys/conf/options.i386#4 integrate .. //depot/projects/linuxolator/src/sys/conf/options.powerpc#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/wpi/LICENSE#1 branch .. //depot/projects/linuxolator/src/sys/contrib/dev/wpi/iwlwifi-3945-2.14.4.fw.uu#1 branch .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/fil.c#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/ip_auth.c#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/ip_compat.h#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/ip_fil.h#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#4 integrate .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/ip_frag.c#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/ip_htable.c#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/ip_log.c#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/ip_lookup.c#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/ip_lookup.h#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/ip_nat.c#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/ip_nat.h#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/ip_pool.c#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/ip_pool.h#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/ip_proxy.c#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/ip_scan.c#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/ip_state.c#4 integrate .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/ip_state.h#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/ip_sync.c#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/ipl.h#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/common/avl/avl.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/common/nvpair/nvpair.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/gfs.c#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#5 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#4 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#4 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#4 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/rpc/xdr.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/rpc/xdr.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/byteorder.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/procset.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/vfs.h#2 delete .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/vmem.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/pf/net/pf.c#6 integrate .. //depot/projects/linuxolator/src/sys/contrib/pf/net/pf_if.c#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/pf/net/pf_ioctl.c#4 integrate .. //depot/projects/linuxolator/src/sys/contrib/pf/net/pf_table.c#3 integrate .. //depot/projects/linuxolator/src/sys/ddb/db_capture.c#1 branch .. //depot/projects/linuxolator/src/sys/ddb/db_command.c#6 integrate .. //depot/projects/linuxolator/src/sys/ddb/db_command.h#2 integrate .. //depot/projects/linuxolator/src/sys/ddb/db_examine.c#3 integrate .. //depot/projects/linuxolator/src/sys/ddb/db_input.c#2 integrate .. //depot/projects/linuxolator/src/sys/ddb/db_lex.c#2 integrate .. //depot/projects/linuxolator/src/sys/ddb/db_lex.h#2 integrate .. //depot/projects/linuxolator/src/sys/ddb/db_main.c#3 integrate .. //depot/projects/linuxolator/src/sys/ddb/db_output.c#4 integrate .. //depot/projects/linuxolator/src/sys/ddb/db_ps.c#5 integrate .. //depot/projects/linuxolator/src/sys/ddb/db_script.c#1 branch .. //depot/projects/linuxolator/src/sys/ddb/db_textdump.c#1 branch .. //depot/projects/linuxolator/src/sys/ddb/ddb.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/aac/aac.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/aac/aac_cam.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/aac/aac_debug.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/aac/aac_pci.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/aac/aacreg.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/aac/aacvar.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/acpi_support/acpi_ibm.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/Osd/OsdDebug.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/acpi.c#8 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/acpi_battery.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/acpi_cpu.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/acpi_ec.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/acpi_hpet.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/acpi_pci.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/acpi_pci_link.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/acpi_thermal.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/acpivar.h#5 integrate .. //depot/projects/linuxolator/src/sys/dev/agp/agp.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/agp/agp_ali.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/agp/agp_amd.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/agp/agp_amd64.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/agp/agp_ati.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/agp/agp_i810.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/agp/agp_if.m#1 branch .. //depot/projects/linuxolator/src/sys/dev/agp/agp_intel.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/agp/agp_nvidia.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/agp/agp_sis.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/agp/agp_via.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/agp/agppriv.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/agp/agpreg.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/agp/agpvar.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/aic7xxx/aic_osm_lib.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/aic7xxx/aic_osm_lib.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/amr/amr.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/amr/amr_cam.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/amr/amr_pci.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/amr/amrvar.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/an/if_an.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/an/if_anreg.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/arcmsr/arcmsr.c#10 integrate .. //depot/projects/linuxolator/src/sys/dev/arcmsr/arcmsr.h#5 integrate .. //depot/projects/linuxolator/src/sys/dev/asmc/asmc.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/asmc/asmcvar.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/ata/ata-all.h#8 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-chipset.c#16 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-disk.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-dma.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-lowlevel.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-pci.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-pci.h#8 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/atapi-cd.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/atapi-cd.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/atapi-fd.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/atapi-tape.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/ath/ath_rate/sample/sample.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/ath/if_ath_pci.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/atkbdc/atkbd.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/atkbdc/atkbd_atkbdc.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/bce/if_bce.c#14 integrate .. //depot/projects/linuxolator/src/sys/dev/bfe/if_bfe.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/bge/if_bge.c#19 integrate .. //depot/projects/linuxolator/src/sys/dev/bge/if_bgereg.h#13 integrate .. //depot/projects/linuxolator/src/sys/dev/bktr/msp34xx.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ciss/ciss.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/cm/smc90cx6.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/coretemp/coretemp.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ctau/if_ct.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/cx/if_cx.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/common/cxgb_t3_cpl.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/cxgb_adapter.h#6 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/cxgb_config.h#4 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/cxgb_include.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/cxgb_l2t.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/cxgb_l2t.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/cxgb_main.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/cxgb_offload.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/cxgb_offload.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/cxgb_osdep.h#5 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/cxgb_sge.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/sys/cxgb_support.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/cxgb/sys/mbufq.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/sys/mvec.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/sys/uipc_mvec.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/t3cdev.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/cxgb/ulp/toecore/cxgb_toedev.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/cxgb/ulp/toecore/toedev.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/cxgb/ulp/toecore/toedev.h#2 delete .. //depot/projects/linuxolator/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/cxgb/ulp/tom/cxgb_defs.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/cxgb/ulp/tom/cxgb_listen.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/cxgb/ulp/tom/cxgb_tcp.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/cxgb/ulp/tom/cxgb_tcp_subr.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/cxgb/ulp/tom/cxgb_tcp_usrreq.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/cxgb/ulp/tom/cxgb_tom.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/cxgb/ulp/tom/cxgb_tom.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/dc/dcphy.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/dc/if_dc.c#8 integrate .. //depot/projects/linuxolator/src/sys/dev/dcons/dcons_os.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/drm/drmP.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/drm/drm_agpsupport.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/ed/if_ed_pci.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/ed/if_ed_rtl80x9.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/em/e1000_80003es2lan.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/em/e1000_80003es2lan.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/em/e1000_82540.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/em/e1000_82541.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/em/e1000_82541.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/em/e1000_82542.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/em/e1000_82543.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/em/e1000_82543.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/em/e1000_82571.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/em/e1000_82571.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/em/e1000_82575.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/em/e1000_82575.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/em/e1000_api.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/em/e1000_api.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/em/e1000_defines.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/em/e1000_hw.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/em/e1000_ich8lan.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/em/e1000_ich8lan.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/em/e1000_mac.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/em/e1000_mac.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/em/e1000_manage.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/em/e1000_manage.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/em/e1000_nvm.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/em/e1000_nvm.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/em/e1000_osdep.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/em/e1000_phy.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/em/e1000_phy.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/em/e1000_regs.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/em/if_em.c#15 integrate .. //depot/projects/linuxolator/src/sys/dev/em/if_em.h#8 integrate .. //depot/projects/linuxolator/src/sys/dev/esp/esp_sbus.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/fb/creator.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/fb/fb.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/fb/fbreg.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/fb/machfb.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/fb/splash_bmp.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/fb/splash_pcx.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/fb/vga.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/fdc/fdc.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/firewire/firewire.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/flash/at45d.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/gem/if_gem.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/gem/if_gem_pci.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/gem/if_gemreg.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/gem/if_gemvar.h#4 integrate .. //depot/projects/linuxolator/src/sys/dev/hptmv/entry.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/hptrr/amd64-elf.hptrr_lib.o.uu#1 branch .. //depot/projects/linuxolator/src/sys/dev/hptrr/array.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/hptrr/him.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/hptrr/himfuncs.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/hptrr/hptintf.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/hptrr/hptrr_config.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/hptrr/hptrr_config.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/hptrr/hptrr_os_bsd.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/hptrr/hptrr_osm_bsd.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/hptrr/i386-elf.hptrr_lib.o.uu#1 branch .. //depot/projects/linuxolator/src/sys/dev/hptrr/ldm.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/hptrr/list.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/hptrr/os_bsd.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/hptrr/osm.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/hwpmc/hwpmc_amd.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/hwpmc/hwpmc_arm.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/hwpmc/hwpmc_ia64.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/hwpmc/hwpmc_logging.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/hwpmc/hwpmc_mod.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/hwpmc/hwpmc_piv.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/hwpmc/hwpmc_powerpc.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/hwpmc/hwpmc_ppro.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/hwpmc/hwpmc_sparc64.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/hwpmc/hwpmc_x86.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ichsmb/ichsmb_pci.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/ichwd/ichwd.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/ichwd/ichwd.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/idt/idt_pci.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/if_ndis/if_ndis.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/if_ndis/if_ndis_pci.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/if_ndis/if_ndisvar.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/iir/iir.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/ipmi/ipmi_kcs.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ipmi/ipmi_smic.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/ipmi/ipmi_ssif.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/ipw/if_ipw.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/ipw/if_ipwreg.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ipw/if_ipwvar.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/iscsi/initiator/isc_sm.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/iscsi/initiator/isc_soc.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/isp_freebsd.c#14 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/isp_sbus.c#12 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/isp_target.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/iwi/if_iwi.c#13 integrate .. //depot/projects/linuxolator/src/sys/dev/kbd/kbd.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/kbd/kbdreg.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/kbdmux/kbdmux.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/le/am7990.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/le/am79900.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/lge/if_lge.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/md/md.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/mfi/mfi.c#12 integrate .. //depot/projects/linuxolator/src/sys/dev/mfi/mfi_cam.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mfi/mfi_pci.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/amphy.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/e1000phy.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/e1000phyreg.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/gentbi.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/miidevs#10 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/nsphy.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/rgephy.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/rgephyreg.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/rlphy.c#8 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/tdkphy.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/ukphy_subr.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mmc/mmcsd.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/mpt/mpt.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/mpt/mpt.h#9 integrate .. //depot/projects/linuxolator/src/sys/dev/mpt/mpt_cam.c#17 integrate .. //depot/projects/linuxolator/src/sys/dev/mpt/mpt_raid.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/msk/if_msk.c#10 integrate .. //depot/projects/linuxolator/src/sys/dev/msk/if_mskreg.h#4 integrate .. //depot/projects/linuxolator/src/sys/dev/my/if_my.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/nfe/if_nfe.c#9 integrate .. //depot/projects/linuxolator/src/sys/dev/nge/if_nge.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/nve/if_nve.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/nvram/nvram.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/nxge/if_nxge.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/nxge/if_nxge.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/nxge/include/build-version.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/nxge/include/version.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/nxge/include/xge-debug.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/nxge/include/xge-defs.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/nxge/include/xge-list.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/nxge/include/xge-os-pal.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/nxge/include/xge-os-template.h#2 delete .. //depot/projects/linuxolator/src/sys/dev/nxge/include/xge-queue.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/nxge/include/xgehal-channel.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/nxge/include/xgehal-config.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/nxge/include/xgehal-device.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/nxge/include/xgehal-driver.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/nxge/include/xgehal-event.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/nxge/include/xgehal-fifo.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/nxge/include/xgehal-mgmt.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/nxge/include/xgehal-mgmtaux.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/nxge/include/xgehal-mm.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/nxge/include/xgehal-regs.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/nxge/include/xgehal-ring.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/nxge/include/xgehal-stats.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/nxge/include/xgehal-types.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/nxge/include/xgehal.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/nxge/xge-osdep.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/nxge/xgehal/xge-queue.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/nxge/xgehal/xgehal-channel-fp.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/nxge/xgehal/xgehal-channel.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/nxge/xgehal/xgehal-config.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/nxge/xgehal/xgehal-device-fp.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/nxge/xgehal/xgehal-device.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/nxge/xgehal/xgehal-driver.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/nxge/xgehal/xgehal-fifo-fp.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/nxge/xgehal/xgehal-fifo.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/nxge/xgehal/xgehal-mgmt.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/nxge/xgehal/xgehal-mgmtaux.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/nxge/xgehal/xgehal-mm.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/nxge/xgehal/xgehal-ring-fp.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/nxge/xgehal/xgehal-ring.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/nxge/xgehal/xgehal-stats.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/nxge/xgell-version.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ofw/ofw_console.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/ofw/ofw_disk.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ofw/openpromio.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/pccard/pccard_cis_quirks.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/pccard/pccarddevs#4 integrate .. //depot/projects/linuxolator/src/sys/dev/pccbb/pccbb.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/pccbb/pccbb_pci.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/pci/pci.c#23 integrate .. //depot/projects/linuxolator/src/sys/dev/pci/pci_user.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/powermac_nvram/powermac_nvram.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ppbus/ppbconf.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/ppbus/ppbconf.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/puc/puc_pci.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/puc/pucdata.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/ral/rt2560.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/ral/rt2661.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/random/harvest.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/random/randomdev_soft.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/random/yarrow.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/re/if_re.c#14 integrate .. //depot/projects/linuxolator/src/sys/dev/safe/safe.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/si/si_pci.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sio/sio.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sio/sio_isa.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sio/sio_puc.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sk/if_sk.c#8 integrate .. //depot/projects/linuxolator/src/sys/dev/snp/snp.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/isa/ad1816.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/isa/ad1816.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/midi/sequencer.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/atiixp.c#9 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/atiixp.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/emu10kx.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/envy24.c#9 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/envy24ht.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/hda/hdac.c#20 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/ich.c#9 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/maestro.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/t4dwave.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/ac97.c#8 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/ac97_patch.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/channel.c#10 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/sbus/cs4231.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/stge/if_stge.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/streams/streams.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/syscons/blank/blank_saver.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/syscons/daemon/daemon_saver.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/syscons/dragon/dragon_saver.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/syscons/fade/fade_saver.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/syscons/fire/fire_saver.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/syscons/green/green_saver.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/syscons/logo/logo_saver.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/syscons/rain/rain_saver.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/syscons/scgfbrndr.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/syscons/scvgarndr.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/syscons/scvidctl.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/syscons/snake/snake_saver.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/syscons/star/star_saver.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/syscons/syscons.c#8 integrate .. //depot/projects/linuxolator/src/sys/dev/syscons/syscons.h#4 integrate .. //depot/projects/linuxolator/src/sys/dev/syscons/warp/warp_saver.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/ti/if_ti.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/twa/tw_cl_init.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/twa/tw_cl_intr.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/twa/tw_cl_io.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/twa/tw_cl_misc.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/twa/tw_cl_share.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/twa/tw_osl.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/twa/tw_osl_cam.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/twa/tw_osl_freebsd.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/twa/tw_osl_share.h#4 integrate .. //depot/projects/linuxolator/src/sys/dev/txp/if_txp.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/uart/uart_core.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/uart/uart_cpu_powerpc.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/ehci.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/ehci_pci.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/if_axe.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/if_axereg.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/if_rum.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/if_udav.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/if_ural.c#8 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/if_zyd.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/if_zydfw.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/if_zydreg.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/uchcom.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/usb/uhci_pci.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/uipaq.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/ukbd.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/umass.c#8 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/ums.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/uplcom.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/usb.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/usb_port.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/usb_quirks.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/usbdevs#14 integrate .. //depot/projects/linuxolator/src/sys/dev/utopia/utopia.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/vge/if_vge.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/vkbd/vkbd.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/vx/if_vx_pci.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/wpi/if_wpi.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/wpi/if_wpireg.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/wpi/if_wpivar.h#1 branch .. //depot/projects/linuxolator/src/sys/fs/cd9660/cd9660_lookup.c#2 integrate .. //depot/projects/linuxolator/src/sys/fs/cd9660/cd9660_vfsops.c#4 integrate .. //depot/projects/linuxolator/src/sys/fs/coda/coda_vfsops.c#2 integrate .. //depot/projects/linuxolator/src/sys/fs/coda/coda_vnops.c#2 integrate .. //depot/projects/linuxolator/src/sys/fs/devfs/devfs_devs.c#5 integrate .. //depot/projects/linuxolator/src/sys/fs/devfs/devfs_vnops.c#9 integrate .. //depot/projects/linuxolator/src/sys/fs/fdescfs/fdesc_vfsops.c#3 integrate .. //depot/projects/linuxolator/src/sys/fs/fdescfs/fdesc_vnops.c#4 integrate .. //depot/projects/linuxolator/src/sys/fs/fifofs/fifo_vnops.c#5 integrate .. //depot/projects/linuxolator/src/sys/fs/hpfs/hpfs_subr.h#2 integrate .. //depot/projects/linuxolator/src/sys/fs/hpfs/hpfs_vfsops.c#5 integrate .. //depot/projects/linuxolator/src/sys/fs/hpfs/hpfs_vnops.c#4 integrate .. //depot/projects/linuxolator/src/sys/fs/msdosfs/denode.h#5 integrate .. //depot/projects/linuxolator/src/sys/fs/msdosfs/msdosfs_denode.c#5 integrate .. //depot/projects/linuxolator/src/sys/fs/msdosfs/msdosfs_fat.c#5 integrate .. //depot/projects/linuxolator/src/sys/fs/msdosfs/msdosfs_lookup.c#3 integrate .. //depot/projects/linuxolator/src/sys/fs/msdosfs/msdosfs_vfsops.c#11 integrate .. //depot/projects/linuxolator/src/sys/fs/msdosfs/msdosfs_vnops.c#8 integrate .. //depot/projects/linuxolator/src/sys/fs/ntfs/ntfs_ihash.c#2 integrate .. //depot/projects/linuxolator/src/sys/fs/ntfs/ntfs_subr.c#3 integrate .. //depot/projects/linuxolator/src/sys/fs/ntfs/ntfs_vfsops.c#7 integrate .. //depot/projects/linuxolator/src/sys/fs/ntfs/ntfs_vnops.c#5 integrate .. //depot/projects/linuxolator/src/sys/fs/nullfs/null_subr.c#3 integrate .. //depot/projects/linuxolator/src/sys/fs/nullfs/null_vfsops.c#5 integrate .. //depot/projects/linuxolator/src/sys/fs/nullfs/null_vnops.c#5 integrate .. //depot/projects/linuxolator/src/sys/fs/nwfs/nwfs_node.c#3 integrate .. //depot/projects/linuxolator/src/sys/fs/nwfs/nwfs_vfsops.c#3 integrate .. //depot/projects/linuxolator/src/sys/fs/nwfs/nwfs_vnops.c#2 integrate .. //depot/projects/linuxolator/src/sys/fs/portalfs/portal_vfsops.c#4 integrate .. //depot/projects/linuxolator/src/sys/fs/portalfs/portal_vnops.c#3 integrate .. //depot/projects/linuxolator/src/sys/fs/procfs/procfs.c#4 integrate .. //depot/projects/linuxolator/src/sys/fs/procfs/procfs_map.c#4 integrate .. //depot/projects/linuxolator/src/sys/fs/pseudofs/pseudofs.c#5 integrate .. //depot/projects/linuxolator/src/sys/fs/pseudofs/pseudofs_vncache.c#6 integrate .. //depot/projects/linuxolator/src/sys/fs/pseudofs/pseudofs_vnops.c#4 integrate .. //depot/projects/linuxolator/src/sys/fs/smbfs/smbfs_io.c#3 integrate .. //depot/projects/linuxolator/src/sys/fs/smbfs/smbfs_node.c#5 integrate .. //depot/projects/linuxolator/src/sys/fs/smbfs/smbfs_vfsops.c#3 integrate .. //depot/projects/linuxolator/src/sys/fs/smbfs/smbfs_vnops.c#4 integrate .. //depot/projects/linuxolator/src/sys/fs/tmpfs/tmpfs.h#2 integrate .. //depot/projects/linuxolator/src/sys/fs/tmpfs/tmpfs_subr.c#2 integrate .. //depot/projects/linuxolator/src/sys/fs/tmpfs/tmpfs_vfsops.c#2 integrate .. //depot/projects/linuxolator/src/sys/fs/tmpfs/tmpfs_vnops.c#2 integrate .. //depot/projects/linuxolator/src/sys/fs/udf/udf_vfsops.c#7 integrate .. //depot/projects/linuxolator/src/sys/fs/udf/udf_vnops.c#7 integrate .. //depot/projects/linuxolator/src/sys/fs/unionfs/union.h#4 integrate .. //depot/projects/linuxolator/src/sys/fs/unionfs/union_subr.c#8 integrate .. //depot/projects/linuxolator/src/sys/fs/unionfs/union_vfsops.c#6 integrate .. //depot/projects/linuxolator/src/sys/fs/unionfs/union_vnops.c#7 integrate .. //depot/projects/linuxolator/src/sys/geom/bde/g_bde.c#2 integrate .. //depot/projects/linuxolator/src/sys/geom/bde/g_bde_work.c#2 integrate .. //depot/projects/linuxolator/src/sys/geom/eli/g_eli.c#10 integrate .. //depot/projects/linuxolator/src/sys/geom/eli/g_eli_crypto.c#4 integrate .. //depot/projects/linuxolator/src/sys/geom/geom_bsd.c#2 integrate .. //depot/projects/linuxolator/src/sys/geom/geom_bsd_enc.c#2 integrate .. //depot/projects/linuxolator/src/sys/geom/geom_dev.c#6 integrate .. //depot/projects/linuxolator/src/sys/geom/geom_io.c#7 integrate .. //depot/projects/linuxolator/src/sys/geom/journal/g_journal.c#7 integrate .. //depot/projects/linuxolator/src/sys/geom/label/g_label_reiserfs.c#2 integrate .. //depot/projects/linuxolator/src/sys/geom/mirror/g_mirror.c#5 integrate .. //depot/projects/linuxolator/src/sys/geom/multipath/g_multipath.c#2 integrate .. //depot/projects/linuxolator/src/sys/geom/part/g_part.c#3 integrate .. //depot/projects/linuxolator/src/sys/geom/part/g_part.h#3 integrate .. //depot/projects/linuxolator/src/sys/geom/part/g_part_apm.c#3 integrate .. //depot/projects/linuxolator/src/sys/geom/part/g_part_bsd.c#1 branch .. //depot/projects/linuxolator/src/sys/geom/part/g_part_gpt.c#3 integrate .. //depot/projects/linuxolator/src/sys/geom/raid3/g_raid3.c#7 integrate .. //depot/projects/linuxolator/src/sys/geom/vinum/geom_vinum_drive.c#2 integrate .. //depot/projects/linuxolator/src/sys/geom/vinum/geom_vinum_init.c#2 integrate .. //depot/projects/linuxolator/src/sys/geom/vinum/geom_vinum_plex.c#2 integrate .. //depot/projects/linuxolator/src/sys/geom/vinum/geom_vinum_volume.c#2 integrate .. //depot/projects/linuxolator/src/sys/gnu/fs/ext2fs/ext2_lookup.c#2 integrate .. //depot/projects/linuxolator/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#8 integrate .. //depot/projects/linuxolator/src/sys/gnu/fs/ext2fs/ext2_vnops.c#6 integrate .. //depot/projects/linuxolator/src/sys/gnu/fs/ext2fs/fs.h#2 integrate .. //depot/projects/linuxolator/src/sys/gnu/fs/reiserfs/reiserfs_namei.c#3 integrate .. //depot/projects/linuxolator/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#6 integrate .. //depot/projects/linuxolator/src/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c#3 integrate .. //depot/projects/linuxolator/src/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#3 integrate .. //depot/projects/linuxolator/src/sys/gnu/fs/xfs/FreeBSD/xfs_vfs.c#2 integrate .. //depot/projects/linuxolator/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.c#2 integrate .. //depot/projects/linuxolator/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#3 integrate .. //depot/projects/linuxolator/src/sys/i386/bios/apm.c#3 integrate .. //depot/projects/linuxolator/src/sys/i386/conf/DEFAULTS#5 integrate .. //depot/projects/linuxolator/src/sys/i386/conf/GENERIC#10 integrate .. //depot/projects/linuxolator/src/sys/i386/conf/GENERIC.hints#2 integrate .. //depot/projects/linuxolator/src/sys/i386/conf/NOTES#10 integrate .. //depot/projects/linuxolator/src/sys/i386/conf/PAE#3 integrate .. //depot/projects/linuxolator/src/sys/i386/conf/XBOX#2 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/busdma_machdep.c#7 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/db_trace.c#6 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/exception.s#3 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/genassym.c#6 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/in_cksum.c#2 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/intr_machdep.c#8 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/locore.s#4 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/machdep.c#15 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/mp_machdep.c#10 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/mp_watchdog.c#3 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/msi.c#6 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/pmap.c#14 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/stack_machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/i386/i386/trap.c#8 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/vm_machdep.c#5 integrate .. //depot/projects/linuxolator/src/sys/i386/ibcs2/ibcs2_misc.c#5 integrate .. //depot/projects/linuxolator/src/sys/i386/ibcs2/imgact_coff.c#3 integrate .. //depot/projects/linuxolator/src/sys/i386/include/bootinfo.h#2 integrate .. //depot/projects/linuxolator/src/sys/i386/include/clock.h#4 integrate .. //depot/projects/linuxolator/src/sys/i386/include/ieeefp.h#2 integrate .. //depot/projects/linuxolator/src/sys/i386/include/in_cksum.h#2 integrate .. //depot/projects/linuxolator/src/sys/i386/include/pc/bios.h#2 integrate .. //depot/projects/linuxolator/src/sys/i386/include/pmap.h#7 integrate .. //depot/projects/linuxolator/src/sys/i386/include/pmc_mdep.h#2 integrate .. //depot/projects/linuxolator/src/sys/i386/include/stack.h#1 branch .. //depot/projects/linuxolator/src/sys/i386/include/vmparam.h#4 integrate .. //depot/projects/linuxolator/src/sys/i386/isa/clock.c#8 integrate .. //depot/projects/linuxolator/src/sys/i386/isa/prof_machdep.c#5 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/imgact_linux.c#4 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/linux_machdep.c#39 integrate .. //depot/projects/linuxolator/src/sys/i386/pci/pci_cfgreg.c#3 integrate .. //depot/projects/linuxolator/src/sys/i386/pci/pci_pir.c#3 integrate .. //depot/projects/linuxolator/src/sys/i386/xbox/xboxfb.c#3 integrate .. //depot/projects/linuxolator/src/sys/i4b/layer1/isic/i4b_avm_a1.c#5 integrate .. //depot/projects/linuxolator/src/sys/i4b/layer1/isic/i4b_elsa_pcc16.c#4 integrate .. //depot/projects/linuxolator/src/sys/i4b/layer1/isic/i4b_isic.c#3 integrate .. //depot/projects/linuxolator/src/sys/i4b/layer1/isic/i4b_itk_ix1.c#5 integrate .. //depot/projects/linuxolator/src/sys/i4b/layer1/isic/i4b_tel_s016.c#5 integrate .. //depot/projects/linuxolator/src/sys/i4b/layer1/isic/i4b_tel_s0163.c#5 integrate .. //depot/projects/linuxolator/src/sys/i4b/layer1/isic/i4b_tel_s08.c#4 integrate .. //depot/projects/linuxolator/src/sys/ia64/conf/DEFAULTS#6 integrate .. //depot/projects/linuxolator/src/sys/ia64/conf/GENERIC#8 integrate .. //depot/projects/linuxolator/src/sys/ia64/disasm/disasm.h#2 integrate .. //depot/projects/linuxolator/src/sys/ia64/ia64/busdma_machdep.c#5 integrate .. //depot/projects/linuxolator/src/sys/ia64/ia64/db_machdep.c#3 integrate .. //depot/projects/linuxolator/src/sys/ia64/ia64/exception.S#3 integrate .. //depot/projects/linuxolator/src/sys/ia64/ia64/interrupt.c#5 integrate .. //depot/projects/linuxolator/src/sys/ia64/ia64/machdep.c#8 integrate .. //depot/projects/linuxolator/src/sys/ia64/ia64/pmap.c#7 integrate .. //depot/projects/linuxolator/src/sys/ia64/ia64/stack_machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/ia64/ia64/support.S#3 integrate .. //depot/projects/linuxolator/src/sys/ia64/ia64/trap.c#6 integrate .. //depot/projects/linuxolator/src/sys/ia64/ia64/vm_machdep.c#3 integrate .. //depot/projects/linuxolator/src/sys/ia64/include/atomic.h#3 integrate .. //depot/projects/linuxolator/src/sys/ia64/include/pmc_mdep.h#2 integrate .. //depot/projects/linuxolator/src/sys/ia64/include/vmparam.h#3 integrate .. //depot/projects/linuxolator/src/sys/isa/vga_isa.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/Makefile#3 integrate .. //depot/projects/linuxolator/src/sys/kern/imgact_aout.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/imgact_elf.c#6 integrate .. //depot/projects/linuxolator/src/sys/kern/imgact_gzip.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/init_main.c#11 integrate .. //depot/projects/linuxolator/src/sys/kern/init_sysent.c#10 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_acct.c#10 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_alq.c#7 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_clock.c#7 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_conf.c#6 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_cpu.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_descrip.c#13 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_environment.c#5 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_event.c#7 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_exec.c#9 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_exit.c#11 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_fork.c#16 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_idle.c#7 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_intr.c#10 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_jail.c#12 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_kse.c#9 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_kthread.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_ktrace.c#11 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_linker.c#10 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_lock.c#10 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_mbuf.c#7 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_mib.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_module.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_mutex.c#10 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_pmc.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_proc.c#10 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_prot.c#8 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_resource.c#12 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_rmlock.c#1 branch .. //depot/projects/linuxolator/src/sys/kern/kern_rwlock.c#10 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_shutdown.c#6 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_sig.c#14 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_switch.c#8 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_sx.c#10 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_synch.c#12 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_sysctl.c#6 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_tc.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_thr.c#10 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_thread.c#9 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_timeout.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_umtx.c#13 integrate .. //depot/projects/linuxolator/src/sys/kern/link_elf.c#7 integrate .. //depot/projects/linuxolator/src/sys/kern/link_elf_obj.c#5 integrate .. //depot/projects/linuxolator/src/sys/kern/linker_if.m#2 integrate .. //depot/projects/linuxolator/src/sys/kern/p1003_1b.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/sched_4bsd.c#13 integrate .. //depot/projects/linuxolator/src/sys/kern/sched_ule.c#13 integrate .. //depot/projects/linuxolator/src/sys/kern/subr_bus.c#6 integrate .. //depot/projects/linuxolator/src/sys/kern/subr_kdb.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/subr_lock.c#8 integrate .. //depot/projects/linuxolator/src/sys/kern/subr_param.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/subr_pcpu.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/subr_sleepqueue.c#5 integrate .. //depot/projects/linuxolator/src/sys/kern/subr_smp.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/subr_stack.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/subr_taskqueue.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/subr_trap.c#7 integrate .. //depot/projects/linuxolator/src/sys/kern/subr_turnstile.c#6 integrate .. //depot/projects/linuxolator/src/sys/kern/subr_witness.c#13 integrate .. //depot/projects/linuxolator/src/sys/kern/sys_generic.c#8 integrate .. //depot/projects/linuxolator/src/sys/kern/sys_pipe.c#6 integrate .. //depot/projects/linuxolator/src/sys/kern/sys_process.c#6 integrate .. //depot/projects/linuxolator/src/sys/kern/sys_socket.c#5 integrate .. //depot/projects/linuxolator/src/sys/kern/syscalls.c#10 integrate .. //depot/projects/linuxolator/src/sys/kern/syscalls.master#9 integrate .. //depot/projects/linuxolator/src/sys/kern/systrace_args.c#10 integrate .. //depot/projects/linuxolator/src/sys/kern/sysv_msg.c#12 integrate .. //depot/projects/linuxolator/src/sys/kern/sysv_sem.c#11 integrate .. //depot/projects/linuxolator/src/sys/kern/sysv_shm.c#7 integrate .. //depot/projects/linuxolator/src/sys/kern/tty.c#11 integrate .. //depot/projects/linuxolator/src/sys/kern/tty_cons.c#7 integrate .. //depot/projects/linuxolator/src/sys/kern/tty_pty.c#7 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_debug.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_mbuf2.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_mqueue.c#10 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_sem.c#6 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_shm.c#1 branch .. //depot/projects/linuxolator/src/sys/kern/uipc_sockbuf.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_socket.c#17 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_syscalls.c#11 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_usrreq.c#14 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_acl.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_aio.c#10 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_bio.c#13 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_cache.c#5 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_extattr.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_lookup.c#14 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_mount.c#16 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_subr.c#14 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_syscalls.c#18 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_vnops.c#9 integrate .. //depot/projects/linuxolator/src/sys/libkern/arm/ffs.S#2 integrate .. //depot/projects/linuxolator/src/sys/modules/Makefile#16 integrate .. //depot/projects/linuxolator/src/sys/modules/agp/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/modules/amr/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/modules/asmc/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/modules/cxgb/Makefile#5 integrate .. //depot/projects/linuxolator/src/sys/modules/cxgb/cxgb/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/modules/cxgb/toecore/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/modules/cxgb/tom/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/modules/geom/Makefile#6 integrate .. //depot/projects/linuxolator/src/sys/modules/hptrr/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/modules/nvram/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/modules/nxge/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/modules/uchcom/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/modules/wpi/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/modules/wpifw/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/modules/zfs/Makefile#5 integrate .. //depot/projects/linuxolator/src/sys/net/bpf.c#7 integrate .. //depot/projects/linuxolator/src/sys/net/bpf.h#3 integrate .. //depot/projects/linuxolator/src/sys/net/bpf_filter.c#3 integrate .. //depot/projects/linuxolator/src/sys/net/bridgestp.c#13 integrate .. //depot/projects/linuxolator/src/sys/net/bridgestp.h#9 integrate .. //depot/projects/linuxolator/src/sys/net/bsd_comp.c#3 integrate .. //depot/projects/linuxolator/src/sys/net/ethernet.h#7 integrate .. //depot/projects/linuxolator/src/sys/net/ieee8023ad_lacp.c#3 integrate .. //depot/projects/linuxolator/src/sys/net/ieee8023ad_lacp.h#3 integrate .. //depot/projects/linuxolator/src/sys/net/if.c#9 integrate .. //depot/projects/linuxolator/src/sys/net/if.h#3 integrate .. //depot/projects/linuxolator/src/sys/net/if_atmsubr.c#4 integrate .. //depot/projects/linuxolator/src/sys/net/if_bridge.c#16 integrate .. //depot/projects/linuxolator/src/sys/net/if_bridgevar.h#8 integrate .. //depot/projects/linuxolator/src/sys/net/if_disc.c#3 integrate .. //depot/projects/linuxolator/src/sys/net/if_enc.c#3 integrate .. //depot/projects/linuxolator/src/sys/net/if_ethersubr.c#10 integrate .. //depot/projects/linuxolator/src/sys/net/if_fddisubr.c#3 integrate .. //depot/projects/linuxolator/src/sys/net/if_fwsubr.c#4 integrate .. //depot/projects/linuxolator/src/sys/net/if_gif.c#3 integrate .. //depot/projects/linuxolator/src/sys/net/if_iso88025subr.c#3 integrate .. //depot/projects/linuxolator/src/sys/net/if_lagg.c#3 integrate .. //depot/projects/linuxolator/src/sys/net/if_lagg.h#3 integrate .. //depot/projects/linuxolator/src/sys/net/if_loop.c#4 integrate .. //depot/projects/linuxolator/src/sys/net/if_ppp.c#8 integrate .. //depot/projects/linuxolator/src/sys/net/if_stf.c#4 integrate .. //depot/projects/linuxolator/src/sys/net/if_tun.c#5 integrate .. //depot/projects/linuxolator/src/sys/net/if_var.h#5 integrate .. //depot/projects/linuxolator/src/sys/net/if_vlan.c#8 integrate .. //depot/projects/linuxolator/src/sys/net/netisr.h#2 integrate .. //depot/projects/linuxolator/src/sys/net/pfil.c#2 integrate .. //depot/projects/linuxolator/src/sys/net/pfil.h#3 integrate .. //depot/projects/linuxolator/src/sys/net/route.c#4 integrate .. //depot/projects/linuxolator/src/sys/net/route.h#2 integrate .. //depot/projects/linuxolator/src/sys/net80211/ieee80211.c#8 integrate .. //depot/projects/linuxolator/src/sys/net80211/ieee80211.h#4 integrate .. //depot/projects/linuxolator/src/sys/net80211/ieee80211_freebsd.c#4 integrate .. //depot/projects/linuxolator/src/sys/net80211/ieee80211_freebsd.h#5 integrate .. //depot/projects/linuxolator/src/sys/net80211/ieee80211_ht.c#2 integrate .. //depot/projects/linuxolator/src/sys/net80211/ieee80211_ht.h#2 integrate .. //depot/projects/linuxolator/src/sys/net80211/ieee80211_input.c#8 integrate .. //depot/projects/linuxolator/src/sys/net80211/ieee80211_ioctl.c#6 integrate .. //depot/projects/linuxolator/src/sys/net80211/ieee80211_ioctl.h#3 integrate .. //depot/projects/linuxolator/src/sys/net80211/ieee80211_node.c#7 integrate .. //depot/projects/linuxolator/src/sys/net80211/ieee80211_node.h#4 integrate .. //depot/projects/linuxolator/src/sys/net80211/ieee80211_output.c#7 integrate .. //depot/projects/linuxolator/src/sys/net80211/ieee80211_proto.c#6 integrate .. //depot/projects/linuxolator/src/sys/net80211/ieee80211_proto.h#5 integrate .. //depot/projects/linuxolator/src/sys/net80211/ieee80211_radiotap.h#4 integrate .. //depot/projects/linuxolator/src/sys/net80211/ieee80211_scan.c#2 integrate .. //depot/projects/linuxolator/src/sys/net80211/ieee80211_scan_ap.c#2 integrate .. //depot/projects/linuxolator/src/sys/net80211/ieee80211_scan_sta.c#2 integrate .. //depot/projects/linuxolator/src/sys/net80211/ieee80211_var.h#7 integrate .. //depot/projects/linuxolator/src/sys/netatalk/aarp.c#4 integrate .. //depot/projects/linuxolator/src/sys/netatalk/ddp_input.c#4 integrate .. //depot/projects/linuxolator/src/sys/netatalk/ddp_output.c#4 integrate .. //depot/projects/linuxolator/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#4 integrate .. //depot/projects/linuxolator/src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#3 integrate .. //depot/projects/linuxolator/src/sys/netgraph/netgraph.h#4 integrate .. //depot/projects/linuxolator/src/sys/netgraph/ng_base.c#8 integrate .. //depot/projects/linuxolator/src/sys/netgraph/ng_car.c#2 integrate .. //depot/projects/linuxolator/src/sys/netgraph/ng_car.h#2 integrate .. //depot/projects/linuxolator/src/sys/netgraph/ng_cisco.c#2 integrate .. //depot/projects/linuxolator/src/sys/netgraph/ng_l2tp.c#3 integrate .. //depot/projects/linuxolator/src/sys/netgraph/ng_pppoe.c#3 integrate .. //depot/projects/linuxolator/src/sys/netgraph/ng_pppoe.h#2 integrate .. //depot/projects/linuxolator/src/sys/netgraph/ng_socket.c#5 integrate .. //depot/projects/linuxolator/src/sys/netinet/accf_data.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/accf_http.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/if_ether.c#9 integrate .. //depot/projects/linuxolator/src/sys/netinet/if_ether.h#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/igmp.c#4 integrate .. //depot/projects/linuxolator/src/sys/netinet/in.c#8 integrate .. //depot/projects/linuxolator/src/sys/netinet/in_cksum.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/in_gif.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/in_pcb.c#9 integrate .. //depot/projects/linuxolator/src/sys/netinet/in_pcb.h#6 integrate .. //depot/projects/linuxolator/src/sys/netinet/in_proto.c#5 integrate .. //depot/projects/linuxolator/src/sys/netinet/in_rmx.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip.h#4 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_carp.c#8 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_divert.c#6 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_dummynet.c#5 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_dummynet.h#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_ecn.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_encap.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_fastfwd.c#4 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_fw2.c#16 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_fw_pfil.c#4 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_gre.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_icmp.c#4 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_id.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_input.c#6 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Apr 5 09:18:42 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 672DE1065671; Sat, 5 Apr 2008 09:18:42 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 10E291065672 for <perforce@FreeBSD.org>; Sat, 5 Apr 2008 09:18:42 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E703F8FC18 for <perforce@FreeBSD.org>; Sat, 5 Apr 2008 09:18:41 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m359IfRI096677 for <perforce@FreeBSD.org>; Sat, 5 Apr 2008 09:18:41 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m359If6g096675 for perforce@freebsd.org; Sat, 5 Apr 2008 09:18:41 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sat, 5 Apr 2008 09:18:41 GMT Message-Id: <200804050918.m359If6g096675@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky <rdivacky@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Cc: Subject: PERFORCE change 139402 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 05 Apr 2008 09:18:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=139402 Change 139402 by rdivacky@rdivacky_witten on 2008/04/05 09:18:06 Initial attempt to implement linuxulator64. This is just a copy of amd64/linux32/* but the syscalls.master is changed to match real amd64 linux. This is a WIP, expect more to come. Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/linux/Makefile#1 add .. //depot/projects/linuxolator/src/sys/amd64/linux/linux.h#1 add .. //depot/projects/linuxolator/src/sys/amd64/linux/linux_dummy.c#1 add .. //depot/projects/linuxolator/src/sys/amd64/linux/linux_genassym.c#1 add .. //depot/projects/linuxolator/src/sys/amd64/linux/linux_ipc64.h#1 add .. //depot/projects/linuxolator/src/sys/amd64/linux/linux_locore.s#1 add .. //depot/projects/linuxolator/src/sys/amd64/linux/linux_machdep.c#1 add .. //depot/projects/linuxolator/src/sys/amd64/linux/linux_proto.h#1 add .. //depot/projects/linuxolator/src/sys/amd64/linux/linux_support.s#1 add .. //depot/projects/linuxolator/src/sys/amd64/linux/linux_syscall.h#1 add .. //depot/projects/linuxolator/src/sys/amd64/linux/linux_sysent.c#1 add .. //depot/projects/linuxolator/src/sys/amd64/linux/linux_sysvec.c#1 add .. //depot/projects/linuxolator/src/sys/amd64/linux/syscalls.conf#1 add .. //depot/projects/linuxolator/src/sys/amd64/linux/syscalls.master#1 add .. //depot/projects/linuxolator/src/sys/compat/linux/linux_socket.c#17 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_socket.c#17 (text+ko) ==== @@ -543,7 +543,7 @@ int protocol; }; -static int +int linux_socket(struct thread *td, struct linux_socket_args *args) { struct linux_socket_args linux_args; @@ -610,7 +610,7 @@ int namelen; }; -static int +int linux_bind(struct thread *td, struct linux_bind_args *args) { struct linux_bind_args linux_args; @@ -715,7 +715,7 @@ l_uintptr_t namelen; }; -static int +int linux_accept(struct thread *td, struct linux_accept_args *args) { struct linux_accept_args linux_args; @@ -765,7 +765,7 @@ l_uintptr_t namelen; }; -static int +int linux_getsockname(struct thread *td, struct linux_getsockname_args *args) { struct linux_getsockname_args linux_args; @@ -799,7 +799,7 @@ l_uintptr_t namelen; }; -static int +int linux_getpeername(struct thread *td, struct linux_getpeername_args *args) { struct linux_getpeername_args linux_args; @@ -833,7 +833,7 @@ l_uintptr_t rsv; }; -static int +int linux_socketpair(struct thread *td, struct linux_socketpair_args *args) { struct linux_socketpair_args linux_args; @@ -865,7 +865,7 @@ int flags; }; -static int +int linux_send(struct thread *td, struct linux_send_args *args) { struct linux_send_args linux_args; @@ -961,7 +961,7 @@ l_uintptr_t fromlen; }; -static int +int linux_recvfrom(struct thread *td, struct linux_recvfrom_args *args) { struct linux_recvfrom_args linux_args; @@ -1011,7 +1011,7 @@ int flags; }; -static int +int linux_sendmsg(struct thread *td, struct linux_sendmsg_args *args) { struct linux_sendmsg_args linux_args; @@ -1063,7 +1063,7 @@ int flags; }; -static int +int linux_recvmsg(struct thread *td, struct linux_recvmsg_args *args) { struct linux_recvmsg_args linux_args; From owner-p4-projects@FreeBSD.ORG Sat Apr 5 14:01:39 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D30C1065677; Sat, 5 Apr 2008 14:01:39 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 29B0A1065671 for <perforce@FreeBSD.org>; Sat, 5 Apr 2008 14:01:39 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F3B828FC1E for <perforce@FreeBSD.org>; Sat, 5 Apr 2008 14:01:38 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m35E1cQJ023289 for <perforce@FreeBSD.org>; Sat, 5 Apr 2008 14:01:38 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m35E1cr0023287 for perforce@freebsd.org; Sat, 5 Apr 2008 14:01:38 GMT (envelope-from gonzo@FreeBSD.org) Date: Sat, 5 Apr 2008 14:01:38 GMT Message-Id: <200804051401.m35E1cr0023287@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko <gonzo@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Cc: Subject: PERFORCE change 139413 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 05 Apr 2008 14:01:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=139413 Change 139413 by gonzo@gonzo_jeeves on 2008/04/05 14:01:28 o Check the right struct field Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/idt/if_kr.c#2 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/idt/if_kr.c#2 (text+ko) ==== @@ -218,7 +218,7 @@ sc->kr_tx_ovr_irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, KR_TX_OVR_IRQ, KR_TX_OVR_IRQ, 1, RF_SHAREABLE | RF_ACTIVE); - if (sc->kr_tx_irq == NULL) { + if (sc->kr_tx_ovr_irq == NULL) { device_printf(dev, "couldn't map tx overrun interrupt\n"); error = ENXIO; goto fail; From owner-p4-projects@FreeBSD.ORG Sat Apr 5 16:23:10 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E44DB1065678; Sat, 5 Apr 2008 16:23:09 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A46351065674 for <perforce@freebsd.org>; Sat, 5 Apr 2008 16:23:09 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 736A78FC1A for <perforce@freebsd.org>; Sat, 5 Apr 2008 16:23:09 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m35GN9bp033296 for <perforce@freebsd.org>; Sat, 5 Apr 2008 16:23:09 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m35GN9va033294 for perforce@freebsd.org; Sat, 5 Apr 2008 16:23:09 GMT (envelope-from sam@freebsd.org) Date: Sat, 5 Apr 2008 16:23:09 GMT Message-Id: <200804051623.m35GN9va033294@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler <sam@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Cc: Subject: PERFORCE change 139418 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 05 Apr 2008 16:23:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=139418 Change 139418 by sam@sam_ebb on 2008/04/05 16:22:21 correct locking on detach Affected files ... .. //depot/projects/vap/sys/dev/ral/rt2560.c#25 edit .. //depot/projects/vap/sys/dev/ral/rt2661.c#22 edit Differences ... ==== //depot/projects/vap/sys/dev/ral/rt2560.c#25 (text) ==== @@ -360,7 +360,6 @@ struct ieee80211com *ic = ifp->if_l2com; rt2560_stop(sc); - RAL_LOCK(sc); bpfdetach(ifp); ieee80211_ifdetach(ic); ==== //depot/projects/vap/sys/dev/ral/rt2661.c#22 (text) ==== @@ -358,6 +358,7 @@ RAL_LOCK(sc); rt2661_stop_locked(sc); callout_stop(&sc->watchdog_ch); + RAL_UNLOCK(sc); bpfdetach(ifp); ieee80211_ifdetach(ic); From owner-p4-projects@FreeBSD.ORG Sat Apr 5 21:14:25 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 07E0C1065674; Sat, 5 Apr 2008 21:14:25 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A5DFF106566C for <perforce@freebsd.org>; Sat, 5 Apr 2008 21:14:24 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 83E638FC21 for <perforce@freebsd.org>; Sat, 5 Apr 2008 21:14:24 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m35LEOVE068179 for <perforce@freebsd.org>; Sat, 5 Apr 2008 21:14:24 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m35LEOv5068177 for perforce@freebsd.org; Sat, 5 Apr 2008 21:14:24 GMT (envelope-from jhb@freebsd.org) Date: Sat, 5 Apr 2008 21:14:24 GMT Message-Id: <200804052114.m35LEOv5068177@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Cc: Subject: PERFORCE change 139431 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 05 Apr 2008 21:14:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=139431 Change 139431 by jhb@jhb_mutex on 2008/04/05 21:13:40 IFC @139430 Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/intr_machdep.c#31 integrate .. //depot/projects/smpng/sys/arm/arm/intr.c#18 integrate .. //depot/projects/smpng/sys/conf/Makefile.arm#30 integrate .. //depot/projects/smpng/sys/conf/options#149 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdSynch.c#21 integrate .. //depot/projects/smpng/sys/dev/asmc/asmc.c#2 integrate .. //depot/projects/smpng/sys/dev/de/if_de.c#6 integrate .. //depot/projects/smpng/sys/dev/mii/ip1000phy.c#3 integrate .. //depot/projects/smpng/sys/dev/mii/ip1000phyreg.h#2 integrate .. //depot/projects/smpng/sys/dev/mii/miidevs#28 integrate .. //depot/projects/smpng/sys/i386/i386/intr_machdep.c#31 integrate .. //depot/projects/smpng/sys/ia64/ia64/interrupt.c#41 integrate .. //depot/projects/smpng/sys/kern/kern_intr.c#93 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/intr_machdep.c#15 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/intr_machdep.c#29 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/intr_machdep.c#9 integrate .. //depot/projects/smpng/sys/sys/interrupt.h#25 integrate .. //depot/projects/smpng/sys/vm/vm_phys.c#4 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/intr_machdep.c#31 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.39 2008/03/17 22:42:00 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.40 2008/04/05 19:58:28 jhb Exp $ */ /* @@ -85,9 +85,6 @@ static int intr_assign_cpu(void *arg, u_char cpu); static void intr_disable_src(void *arg); -#ifdef INTR_FILTER -static void intr_event_stray(void *cookie); -#endif static void intr_init(void *__dummy); static int intr_pic_registered(struct pic *pic); static void intrcnt_setname(const char *name, int index); @@ -238,12 +235,11 @@ isrc->is_pic->pic_disable_source(isrc, PIC_EOI); } -#ifdef INTR_FILTER void intr_execute_handlers(struct intsrc *isrc, struct trapframe *frame) { + struct intr_event *ie; struct thread *td; - struct intr_event *ie; int vector; td = curthread; @@ -267,64 +263,11 @@ if (vector == 0) clkintr_pending = 1; - if (intr_event_handle(ie, frame) != 0) - intr_event_stray(isrc); -} - -static void -intr_event_stray(void *cookie) -{ - struct intsrc *isrc; - - isrc = cookie; /* * For stray interrupts, mask and EOI the source, bump the * stray count, and log the condition. */ - isrc->is_pic->pic_disable_source(isrc, PIC_EOI); - (*isrc->is_straycount)++; - if (*isrc->is_straycount < MAX_STRAY_LOG) - log(LOG_ERR, "stray irq%d\n", isrc->is_pic->pic_vector(isrc)); - else if (*isrc->is_straycount == MAX_STRAY_LOG) - log(LOG_CRIT, - "too many stray irq %d's: not logging anymore\n", - isrc->is_pic->pic_vector(isrc)); -} -#else -void -intr_execute_handlers(struct intsrc *isrc, struct trapframe *frame) -{ - struct thread *td; - struct intr_event *ie; - struct intr_handler *ih; - int error, vector, thread, ret; - - td = curthread; - - /* - * We count software interrupts when we process them. The - * code here follows previous practice, but there's an - * argument for counting hardware interrupts when they're - * processed too. - */ - (*isrc->is_count)++; - PCPU_INC(cnt.v_intr); - - ie = isrc->is_event; - - /* - * XXX: We assume that IRQ 0 is only used for the ISA timer - * device (clk). - */ - vector = isrc->is_pic->pic_vector(isrc); - if (vector == 0) - clkintr_pending = 1; - - /* - * For stray interrupts, mask and EOI the source, bump the - * stray count, and log the condition. - */ - if (ie == NULL || TAILQ_EMPTY(&ie->ie_handlers)) { + if (intr_event_handle(ie, frame) != 0) { isrc->is_pic->pic_disable_source(isrc, PIC_EOI); (*isrc->is_straycount)++; if (*isrc->is_straycount < MAX_STRAY_LOG) @@ -333,60 +276,8 @@ log(LOG_CRIT, "too many stray irq %d's: not logging anymore\n", vector); - return; } - - /* - * Execute fast interrupt handlers directly. - * To support clock handlers, if a handler registers - * with a NULL argument, then we pass it a pointer to - * a trapframe as its argument. - */ - td->td_intr_nesting_level++; - ret = 0; - thread = 0; - critical_enter(); - TAILQ_FOREACH(ih, &ie->ie_handlers, ih_next) { - if (ih->ih_filter == NULL) { - thread = 1; - continue; - } - CTR4(KTR_INTR, "%s: exec %p(%p) for %s", __func__, - ih->ih_filter, ih->ih_argument == NULL ? frame : - ih->ih_argument, ih->ih_name); - if (ih->ih_argument == NULL) - ret = ih->ih_filter(frame); - else - ret = ih->ih_filter(ih->ih_argument); - /* - * Wrapper handler special case: see - * i386/intr_machdep.c::intr_execute_handlers() - */ - if (!thread) { - if (ret == FILTER_SCHEDULE_THREAD) - thread = 1; - } - } - - /* - * If there are any threaded handlers that need to run, - * mask the source as well as sending it an EOI. Otherwise, - * just send it an EOI but leave it unmasked. - */ - if (thread) - isrc->is_pic->pic_disable_source(isrc, PIC_EOI); - else - isrc->is_pic->pic_eoi_source(isrc); - - /* Schedule the ithread if needed. */ - if (thread) { - error = intr_event_schedule_thread(ie); - KASSERT(error == 0, ("bad stray interrupt")); - } - critical_exit(); - td->td_intr_nesting_level--; } -#endif void intr_resume(void) ==== //depot/projects/smpng/sys/arm/arm/intr.c#18 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/intr.c,v 1.19 2008/03/17 22:42:00 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/intr.c,v 1.20 2008/04/05 19:58:28 jhb Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/syslog.h> @@ -72,7 +72,7 @@ if (event == NULL) { error = intr_event_create(&event, (void *)irq, 0, (mask_fn)arm_mask_irq, (mask_fn)arm_unmask_irq, - (mask_fn)arm_unmask_irq, NULL, "intr%d:", irq); + NULL, NULL, "intr%d:", irq); if (error) return; intr_events[irq] = event; @@ -106,57 +106,17 @@ { struct intr_event *event; struct thread *td = curthread; -#ifdef INTR_FILTER int i; -#else - int i, thread, ret; - struct intr_handler *ih; -#endif PCPU_INC(cnt.v_intr); td->td_intr_nesting_level++; while ((i = arm_get_next_irq()) != -1) { -#ifndef INTR_FILTER - arm_mask_irq(i); -#endif intrcnt[intrcnt_tab[i]]++; event = intr_events[i]; - if (!event || TAILQ_EMPTY(&event->ie_handlers)) { -#ifdef INTR_FILTER + if (intr_event_handle(event, frame) != 0) { + /* XXX: Log stray IRQs */ arm_mask_irq(i); -#endif - continue; - } - -#ifdef INTR_FILTER - intr_event_handle(event, frame); - /* XXX: Log stray IRQs */ -#else - /* Execute fast handlers. */ - ret = 0; - thread = 0; - TAILQ_FOREACH(ih, &event->ie_handlers, ih_next) { - if (ih->ih_filter == NULL) - thread = 1; - else - ret = ih->ih_filter(ih->ih_argument ? - ih->ih_argument : frame); - /* - * Wrapper handler special case: see - * i386/intr_machdep.c::intr_execute_handlers() - */ - if (!thread) { - if (ret == FILTER_SCHEDULE_THREAD) - thread = 1; - } } - - /* Schedule thread if needed. */ - if (thread) - intr_event_schedule_thread(event); - else - arm_unmask_irq(i); -#endif } td->td_intr_nesting_level--; } ==== //depot/projects/smpng/sys/conf/Makefile.arm#30 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.arm -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.arm,v 1.37 2008/04/04 17:35:24 raj Exp $ +# $FreeBSD: src/sys/conf/Makefile.arm,v 1.38 2008/04/04 19:33:09 imp Exp $ # # Makefile for FreeBSD # @@ -40,6 +40,10 @@ CC += -mbig-endian SYSTEM_LD += -EB LD += -EB +.else +CC += -mlittle-endian +SYSTEM_LD += -EL +LD += -EL .endif ==== //depot/projects/smpng/sys/conf/options#149 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.623 2008/03/28 17:58:54 marcel Exp $ +# $FreeBSD: src/sys/conf/options,v 1.624 2008/04/05 20:13:14 jhb Exp $ # # On the handling of kernel options # @@ -760,7 +760,7 @@ XFS # Interrupt filtering -INTR_FILTER opt_global.h +INTR_FILTER #Disable code to dispatch tcp offloading TCP_OFFLOAD_DISABLE opt_inet.h ==== //depot/projects/smpng/sys/dev/acpica/Osd/OsdSynch.c#21 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/acpica/Osd/OsdSynch.c,v 1.32 2007/03/26 23:04:02 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/Osd/OsdSynch.c,v 1.33 2008/04/05 14:21:01 takawata Exp $"); #include <contrib/dev/acpica/acpi.h> @@ -346,7 +346,7 @@ snprintf(h->name, sizeof(h->name), "acpi subsystem HW lock"); else snprintf(h->name, sizeof(h->name), "acpi subsys %p", OutHandle); - mtx_init(&h->lock, h->name, NULL, MTX_DEF); + mtx_init(&h->lock, h->name, NULL, MTX_DEF|MTX_RECURSE); *OutHandle = (ACPI_SPINLOCK)h; return (AE_OK); } ==== //depot/projects/smpng/sys/dev/asmc/asmc.c#2 (text+ko) ==== @@ -33,7 +33,9 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/asmc/asmc.c,v 1.2 2007/11/22 23:38:24 rpaulo Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/asmc/asmc.c,v 1.3 2008/04/05 20:13:15 jhb Exp $"); + +#include "opt_intr_filter.h" #include <sys/param.h> #include <sys/bus.h> ==== //depot/projects/smpng/sys/dev/de/if_de.c#6 (text) ==== @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/de/if_de.c,v 1.183 2007/06/07 00:28:47 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/de/if_de.c,v 1.184 2008/04/05 17:24:44 jhb Exp $"); #define TULIP_HDR_DATA @@ -4053,7 +4053,8 @@ /* * bounce a copy to the bpf listener, if any. */ - BPF_MTAP(sc->tulip_ifp, m); + if (!(sc->tulip_flags & TULIP_DEVICEPROBE)) + BPF_MTAP(sc->tulip_ifp, m); /* * The descriptors have been filled in. Now get ready @@ -4437,13 +4438,16 @@ ifmedia_init(&sc->tulip_ifmedia, 0, tulip_ifmedia_change, tulip_ifmedia_status); - sc->tulip_flags &= ~TULIP_DEVICEPROBE; tulip_ifmedia_add(sc); tulip_reset(sc); TULIP_UNLOCK(sc); ether_ifattach(sc->tulip_ifp, sc->tulip_enaddr); + + TULIP_LOCK(sc); + sc->tulip_flags &= ~TULIP_DEVICEPROBE; + TULIP_UNLOCK(sc); } /* Release memory for a single descriptor ring. */ ==== //depot/projects/smpng/sys/dev/mii/ip1000phy.c#3 (text+ko) ==== @@ -27,10 +27,10 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/mii/ip1000phy.c,v 1.2 2006/12/02 15:32:33 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mii/ip1000phy.c,v 1.3 2008/04/05 00:52:07 yongari Exp $"); /* - * Driver for the IC Plus IP1000A 10/100/1000 PHY. + * Driver for the IC Plus IP1000A/IP1001 10/100/1000 PHY. */ #include <sys/param.h> @@ -57,6 +57,12 @@ static int ip1000phy_probe(device_t); static int ip1000phy_attach(device_t); +struct ip1000phy_softc { + struct mii_softc mii_sc; + int model; + int revision; +}; + static device_method_t ip1000phy_methods[] = { /* device interface */ DEVMETHOD(device_probe, ip1000phy_probe), @@ -82,6 +88,7 @@ static const struct mii_phydesc ip1000phys[] = { MII_PHY_DESC(ICPLUS, IP1000A), + MII_PHY_DESC(ICPLUS, IP1001), MII_PHY_END }; @@ -95,11 +102,13 @@ static int ip1000phy_attach(device_t dev) { + struct ip1000phy_softc *isc; struct mii_softc *sc; struct mii_attach_args *ma; struct mii_data *mii; - sc = device_get_softc(dev); + isc = device_get_softc(dev); + sc = &isc->mii_sc; ma = device_get_ivars(dev); sc->mii_dev = device_get_parent(dev); mii = device_get_softc(sc->mii_dev); @@ -114,6 +123,9 @@ mii->mii_instance++; + isc->model = MII_MODEL(ma->mii_id2); + isc->revision = MII_REV(ma->mii_id2); + device_printf(dev, " "); #define ADD(m, c) ifmedia_add(&mii->mii_media, (m), (c), NULL) @@ -302,10 +314,13 @@ static void ip1000phy_status(struct mii_softc *sc) { + struct ip1000phy_softc *isc; struct mii_data *mii = sc->mii_pdata; uint32_t bmsr, bmcr, stat; uint32_t ar, lpar; + isc = (struct ip1000phy_softc *)sc; + mii->mii_media_status = IFM_AVALID; mii->mii_media_active = IFM_ETHER; @@ -326,25 +341,44 @@ } } - stat = PHY_READ(sc, STGE_PhyCtrl); - switch (PC_LinkSpeed(stat)) { - case PC_LinkSpeed_Down: - mii->mii_media_active |= IFM_NONE; - return; - case PC_LinkSpeed_10: - mii->mii_media_active |= IFM_10_T; - break; - case PC_LinkSpeed_100: - mii->mii_media_active |= IFM_100_TX; - break; - case PC_LinkSpeed_1000: - mii->mii_media_active |= IFM_1000_T; - break; + if (isc->model == MII_MODEL_ICPLUS_IP1001) { + stat = PHY_READ(sc, IP1000PHY_LSR); + switch (stat & IP1000PHY_LSR_SPEED_MASK) { + case IP1000PHY_LSR_SPEED_10: + mii->mii_media_active |= IFM_10_T; + break; + case IP1000PHY_LSR_SPEED_100: + mii->mii_media_active |= IFM_100_TX; + break; + case IP1000PHY_LSR_SPEED_1000: + mii->mii_media_active |= IFM_1000_T; + break; + } + if ((stat & IP1000PHY_LSR_FULL_DUPLEX) != 0) + mii->mii_media_active |= IFM_FDX; + else + mii->mii_media_active |= IFM_HDX; + } else { + stat = PHY_READ(sc, STGE_PhyCtrl); + switch (PC_LinkSpeed(stat)) { + case PC_LinkSpeed_Down: + mii->mii_media_active |= IFM_NONE; + return; + case PC_LinkSpeed_10: + mii->mii_media_active |= IFM_10_T; + break; + case PC_LinkSpeed_100: + mii->mii_media_active |= IFM_100_TX; + break; + case PC_LinkSpeed_1000: + mii->mii_media_active |= IFM_1000_T; + break; + } + if ((stat & PC_PhyDuplexStatus) != 0) + mii->mii_media_active |= IFM_FDX; + else + mii->mii_media_active |= IFM_HDX; } - if ((stat & PC_PhyDuplexStatus) != 0) - mii->mii_media_active |= IFM_FDX; - else - mii->mii_media_active |= IFM_HDX; ar = PHY_READ(sc, IP1000PHY_MII_ANAR); lpar = PHY_READ(sc, IP1000PHY_MII_ANLPAR); @@ -410,10 +444,12 @@ static void ip1000phy_reset(struct mii_softc *sc) { + struct ip1000phy_softc *isc; struct stge_softc *stge_sc; struct mii_data *mii; uint32_t reg; + isc = (struct ip1000phy_softc *)sc; mii_phy_reset(sc); /* clear autoneg/full-duplex as we don't want it after reset */ @@ -426,7 +462,8 @@ * XXX There should be more general way to pass PHY specific * data via mii interface. */ - if (strcmp(mii->mii_ifp->if_dname, "stge") == 0) { + if (isc->model == MII_MODEL_ICPLUS_IP1000A && + strcmp(mii->mii_ifp->if_dname, "stge") == 0) { stge_sc = mii->mii_ifp->if_softc; if (stge_sc->sc_rev >= 0x40 && stge_sc->sc_rev <= 0x4e) ip1000phy_load_dspcode(sc); ==== //depot/projects/smpng/sys/dev/mii/ip1000phyreg.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/mii/ip1000phyreg.h,v 1.1 2006/07/25 00:16:09 yongari Exp $ + * $FreeBSD: src/sys/dev/mii/ip1000phyreg.h,v 1.2 2008/04/05 00:52:07 yongari Exp $ */ #ifndef _DEV_MII_IP1000PHYREG_H_ @@ -138,4 +138,49 @@ #define IP1000PHY_EXTSTS_1000X 0x4000 #define IP1000PHY_EXTSTS_1000X_FDX 0x8000 +/* PHY specific control & status register. IP1001 only. */ +#define IP1000PHY_SCSR 0x10 +#define IP1000PHY_SCSR_RXPHASE_SEL 0x0001 +#define IP1000PHY_SCSR_TXPHASE_SEL 0x0002 +#define IP1000PHY_SCSR_REPEATOR_MODE 0x0004 +#define IP1000PHY_SCSR_RESERVED1_DEF 0x0008 +#define IP1000PHY_SCSR_RXCLK_DRV_MASK 0x0060 +#define IP1000PHY_SCSR_RXCLK_DRV_DEF 0x0040 +#define IP1000PHY_SCSR_RXD_DRV_MASK 0x0180 +#define IP1000PHY_SCSR_RXD_DRV_DEF 0x0100 +#define IP1000PHY_SCSR_JABBER_ENB 0x0200 +#define IP1000PHY_SCSR_HEART_BEAT_ENB 0x0400 +#define IP1000PHY_SCSR_DOWNSHIFT_ENB 0x0800 +#define IP1000PHY_SCSR_RESERVED2_DEF 0x1000 +#define IP1000PHY_SCSR_LED_DRV_4MA 0x0000 +#define IP1000PHY_SCSR_LED_DRV_8MA 0x2000 +#define IP1000PHY_SCSR_LED_MODE_MASK 0xC000 +#define IP1000PHY_SCSR_LED_MODE_DEF 0x0000 + +/* PHY link status register. IP1001 only. */ +#define IP1000PHY_LSR 0x11 +#define IP1000PHY_LSR_JABBER_DET 0x0200 +#define IP1000PHY_LSR_APS_SLEEP 0x0400 +#define IP1000PHY_LSR_MDIX 0x0800 +#define IP1000PHY_LSR_FULL_DUPLEX 0x1000 +#define IP1000PHY_LSR_SPEED_10 0x0000 +#define IP1000PHY_LSR_SPEED_100 0x2000 +#define IP1000PHY_LSR_SPEED_1000 0x4000 +#define IP1000PHY_LSR_SPEED_MASK 0x6000 +#define IP1000PHY_LSR_LINKUP 0x8000 + +/* PHY specific control register 2. IP1001 only. */ +#define IP1000PHY_SCR +#define IP1000PHY_SCR_SEW_RATE_MASK 0x0003 +#define IP1000PHY_SCR_SEW_RATE_DEF 0x0003 +#define IP1000PHY_SCR_AUTO_XOVER 0x0004 +#define IP1000PHY_SCR_SPEED_10_100_ENB 0x0040 +#define IP1000PHY_SCR_FIFO_LATENCY_2 0x0000 +#define IP1000PHY_SCR_FIFO_LATENCY_3 0x0080 +#define IP1000PHY_SCR_FIFO_LATENCY_4 0x0100 +#define IP1000PHY_SCR_FIFO_LATENCY_5 0x0180 +#define IP1000PHY_SCR_MDIX_ENB 0x0200 +#define IP1000PHY_SCR_RESERVED_DEF 0x0400 +#define IP1000PHY_SCR_APS_ON 0x0800 + #endif /* _DEV_MII_IP1000PHYREG_H_ */ ==== //depot/projects/smpng/sys/dev/mii/miidevs#28 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/mii/miidevs,v 1.51 2008/03/06 21:42:48 jhb Exp $ +$FreeBSD: src/sys/dev/mii/miidevs,v 1.52 2008/04/05 00:52:07 yongari Exp $ /*$NetBSD: miidevs,v 1.6 1999/05/14 11:37:30 drochner Exp $*/ /*- @@ -159,6 +159,7 @@ /* IC Plus Corp. PHYs */ model ICPLUS IP101 0x0005 IC Plus 10/100 PHY model ICPLUS IP1000A 0x0008 IC Plus 10/100/1000 media interface +model ICPLUS IP1001 0x0019 IC Plus IP1001 10/100/1000 media interface /* Intel PHYs */ model xxINTEL I82553AB 0x0000 i83553 10/100 media interface ==== //depot/projects/smpng/sys/i386/i386/intr_machdep.c#31 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/i386/intr_machdep.c,v 1.34 2008/03/17 22:42:00 jhb Exp $ + * $FreeBSD: src/sys/i386/i386/intr_machdep.c,v 1.35 2008/04/05 19:58:29 jhb Exp $ */ /* @@ -76,9 +76,6 @@ static int intr_assign_cpu(void *arg, u_char cpu); static void intr_disable_src(void *arg); -#ifdef INTR_FILTER -static void intr_event_stray(void *cookie); -#endif static void intr_init(void *__dummy); static int intr_pic_registered(struct pic *pic); static void intrcnt_setname(const char *name, int index); @@ -229,12 +226,11 @@ isrc->is_pic->pic_disable_source(isrc, PIC_EOI); } -#ifdef INTR_FILTER void intr_execute_handlers(struct intsrc *isrc, struct trapframe *frame) { + struct intr_event *ie; struct thread *td; - struct intr_event *ie; int vector; td = curthread; @@ -258,64 +254,11 @@ if (vector == 0) clkintr_pending = 1; - if (intr_event_handle(ie, frame) != 0) - intr_event_stray(isrc); -} - -static void -intr_event_stray(void *cookie) -{ - struct intsrc *isrc; - - isrc = cookie; /* * For stray interrupts, mask and EOI the source, bump the * stray count, and log the condition. */ - isrc->is_pic->pic_disable_source(isrc, PIC_EOI); - (*isrc->is_straycount)++; - if (*isrc->is_straycount < MAX_STRAY_LOG) - log(LOG_ERR, "stray irq%d\n", isrc->is_pic->pic_vector(isrc)); - else if (*isrc->is_straycount == MAX_STRAY_LOG) - log(LOG_CRIT, - "too many stray irq %d's: not logging anymore\n", - isrc->is_pic->pic_vector(isrc)); -} -#else -void -intr_execute_handlers(struct intsrc *isrc, struct trapframe *frame) -{ - struct thread *td; - struct intr_event *ie; - struct intr_handler *ih; - int error, vector, thread, ret; - - td = curthread; - - /* - * We count software interrupts when we process them. The - * code here follows previous practice, but there's an - * argument for counting hardware interrupts when they're - * processed too. - */ - (*isrc->is_count)++; - PCPU_INC(cnt.v_intr); - - ie = isrc->is_event; - - /* - * XXX: We assume that IRQ 0 is only used for the ISA timer - * device (clk). - */ - vector = isrc->is_pic->pic_vector(isrc); - if (vector == 0) - clkintr_pending = 1; - - /* - * For stray interrupts, mask and EOI the source, bump the - * stray count, and log the condition. - */ - if (ie == NULL || TAILQ_EMPTY(&ie->ie_handlers)) { + if (intr_event_handle(ie, frame) != 0) { isrc->is_pic->pic_disable_source(isrc, PIC_EOI); (*isrc->is_straycount)++; if (*isrc->is_straycount < MAX_STRAY_LOG) @@ -324,70 +267,8 @@ log(LOG_CRIT, "too many stray irq %d's: not logging anymore\n", vector); - return; - } - - /* - * Execute fast interrupt handlers directly. - * To support clock handlers, if a handler registers - * with a NULL argument, then we pass it a pointer to - * a trapframe as its argument. - */ - td->td_intr_nesting_level++; - ret = 0; - thread = 0; - critical_enter(); - TAILQ_FOREACH(ih, &ie->ie_handlers, ih_next) { - if (ih->ih_filter == NULL) { - thread = 1; - continue; - } - CTR4(KTR_INTR, "%s: exec %p(%p) for %s", __func__, - ih->ih_filter, ih->ih_argument == NULL ? frame : - ih->ih_argument, ih->ih_name); - if (ih->ih_argument == NULL) - ret = ih->ih_filter(frame); - else - ret = ih->ih_filter(ih->ih_argument); - /* - * Wrapper handler special handling: - * - * in some particular cases (like pccard and pccbb), - * the _real_ device handler is wrapped in a couple of - * functions - a filter wrapper and an ithread wrapper. - * In this case (and just in this case), the filter wrapper - * could ask the system to schedule the ithread and mask - * the interrupt source if the wrapped handler is composed - * of just an ithread handler. - * - * TODO: write a generic wrapper to avoid people rolling - * their own - */ - if (!thread) { - if (ret == FILTER_SCHEDULE_THREAD) - thread = 1; - } } - - /* - * If there are any threaded handlers that need to run, - * mask the source as well as sending it an EOI. Otherwise, - * just send it an EOI but leave it unmasked. - */ - if (thread) - isrc->is_pic->pic_disable_source(isrc, PIC_EOI); - else - isrc->is_pic->pic_eoi_source(isrc); - - /* Schedule the ithread if needed. */ - if (thread) { - error = intr_event_schedule_thread(ie); - KASSERT(error == 0, ("bad stray interrupt")); - } - critical_exit(); - td->td_intr_nesting_level--; } -#endif void intr_resume(void) ==== //depot/projects/smpng/sys/ia64/ia64/interrupt.c#41 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/ia64/ia64/interrupt.c,v 1.64 2008/03/17 22:42:01 jhb Exp $ */ +/* $FreeBSD: src/sys/ia64/ia64/interrupt.c,v 1.65 2008/04/05 19:58:29 jhb Exp $ */ /* $NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $ */ /*- @@ -385,10 +385,6 @@ { struct ia64_intr *i; struct intr_event *ie; /* our interrupt event */ -#ifndef INTR_FILTER - struct intr_handler *ih; - int error, thread, ret; -#endif /* * Find the interrupt thread for this vector. @@ -401,52 +397,14 @@ ie = i->event; KASSERT(ie != NULL, ("%s: interrupt without event", __func__)); -#ifdef INTR_FILTER if (intr_event_handle(ie, frame) != 0) { + /* + * XXX: The pre-INTR_FILTER code didn't mask stray + * interrupts. + */ ia64_intr_mask((void *)(uintptr_t)vector); log(LOG_ERR, "stray irq%u\n", i->irq); } -#else - /* - * As an optimization, if an event has no handlers, don't - * schedule it to run. - */ - if (TAILQ_EMPTY(&ie->ie_handlers)) - return; - - /* - * Execute all fast interrupt handlers directly without Giant. Note - * that this means that any fast interrupt handler must be MP safe. - */ - ret = 0; - thread = 0; - critical_enter(); - TAILQ_FOREACH(ih, &ie->ie_handlers, ih_next) { - if (ih->ih_filter == NULL) { - thread = 1; - continue; - } - CTR4(KTR_INTR, "%s: exec %p(%p) for %s", __func__, - ih->ih_filter, ih->ih_argument, ih->ih_name); - ret = ih->ih_filter(ih->ih_argument); - /* - * Wrapper handler special case: see - * i386/intr_machdep.c::intr_execute_handlers() - */ - if (!thread) { - if (ret == FILTER_SCHEDULE_THREAD) - thread = 1; - } - } - - if (thread) { - ia64_intr_mask((void *)(uintptr_t)vector); - error = intr_event_schedule_thread(ie); - KASSERT(error == 0, ("%s: impossible stray", __func__)); - } else - ia64_intr_eoi((void *)(uintptr_t)vector); - critical_exit(); -#endif } #ifdef DDB ==== //depot/projects/smpng/sys/kern/kern_intr.c#93 (text+ko) ==== @@ -25,9 +25,10 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/kern_intr.c,v 1.159 2008/04/04 01:03:23 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_intr.c,v 1.161 2008/04/05 20:13:15 jhb Exp $"); #include "opt_ddb.h" +#include "opt_intr_filter.h" #include <sys/param.h> #include <sys/bus.h> @@ -94,9 +95,14 @@ static void intr_event_update(struct intr_event *ie); #ifdef INTR_FILTER +static int intr_event_schedule_thread(struct intr_event *ie, + struct intr_thread *ithd); +static int intr_filter_loop(struct intr_event *ie, + struct trapframe *frame, struct intr_thread **ithd); static struct intr_thread *ithread_create(const char *name, struct intr_handler *ih); #else +static int intr_event_schedule_thread(struct intr_event *ie); static struct intr_thread *ithread_create(const char *name); #endif static void ithread_destroy(struct intr_thread *ithread); @@ -239,8 +245,9 @@ int intr_event_create(struct intr_event **event, void *source,int flags, - void (*disable)(void *), void (*enable)(void *), void (*eoi)(void *), - int (*assign_cpu)(void *, u_char), const char *fmt, ...) + void (*pre_ithread)(void *), void (*post_ithread)(void *), + void (*post_filter)(void *), int (*assign_cpu)(void *, u_char), + const char *fmt, ...) { struct intr_event *ie; va_list ap; @@ -250,9 +257,9 @@ return (EINVAL); ie = malloc(sizeof(struct intr_event), M_ITHREAD, M_WAITOK | M_ZERO); ie->ie_source = source; - ie->ie_disable = disable; - ie->ie_enable = enable; - ie->ie_eoi = eoi; + ie->ie_pre_ithread = pre_ithread; + ie->ie_post_ithread = post_ithread; + ie->ie_post_filter = post_filter; ie->ie_assign_cpu = assign_cpu; ie->ie_flags = flags; ie->ie_cpu = NOCPU; @@ -675,7 +682,7 @@ return (0); } -int +static int intr_event_schedule_thread(struct intr_event *ie) { struct intr_entropy entropy; @@ -832,7 +839,7 @@ return (0); } -int +static int intr_event_schedule_thread(struct intr_event *ie, struct intr_thread *it) { struct intr_entropy entropy; @@ -1084,8 +1091,8 @@ * Now that all the handlers have had a chance to run, reenable * the interrupt source. */ - if (ie->ie_enable != NULL) - ie->ie_enable(ie->ie_source); + if (ie->ie_post_ithread != NULL) + ie->ie_post_ithread(ie->ie_source); } #ifndef INTR_FILTER @@ -1172,6 +1179,90 @@ thread_unlock(td); } } + +/* + * Main interrupt handling body. + * + * Input: + * o ie: the event connected to this interrupt. + * o frame: some archs (i.e. i386) pass a frame to some. + * handlers as their main argument. + * Return value: + * o 0: everything ok. + * o EINVAL: stray interrupt. + */ +int +intr_event_handle(struct intr_event *ie, struct trapframe *frame) +{ + struct intr_handler *ih; + struct thread *td; + int error, ret, thread; + + td = curthread; + + /* An interrupt with no event or handlers is a stray interrupt. */ + if (ie == NULL || TAILQ_EMPTY(&ie->ie_handlers)) + return (EINVAL); + + /* + * Execute fast interrupt handlers directly. + * To support clock handlers, if a handler registers + * with a NULL argument, then we pass it a pointer to + * a trapframe as its argument. + */ + td->td_intr_nesting_level++; + thread = 0; + ret = 0; + critical_enter(); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Apr 5 23:26:46 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 307231065672; Sat, 5 Apr 2008 23:26:46 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CC65B106566C for <perforce@freebsd.org>; Sat, 5 Apr 2008 23:26:45 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B072A8FC1A for <perforce@freebsd.org>; Sat, 5 Apr 2008 23:26:45 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m35NQjMb074660 for <perforce@freebsd.org>; Sat, 5 Apr 2008 23:26:45 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m35NQjIp074658 for perforce@freebsd.org; Sat, 5 Apr 2008 23:26:45 GMT (envelope-from sam@freebsd.org) Date: Sat, 5 Apr 2008 23:26:45 GMT Message-Id: <200804052326.m35NQjIp074658@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler <sam@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Cc: Subject: PERFORCE change 139437 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 05 Apr 2008 23:26:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=139437 Change 139437 by sam@sam_ebb on 2008/04/05 23:25:59 o eliminate locking in ieee80211_scan_next; just fire a callout to happen immediately (avoids common LOR with driver softc lock) o add assert in scan_curchan Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_scan.c#20 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_scan.c#20 (text+ko) ==== @@ -806,16 +806,9 @@ ieee80211_scan_next(struct ieee80211vap *vap) { struct ieee80211com *ic = vap->iv_ic; + struct ieee80211_scan_state *ss = ic->ic_scan; - /* - * XXX: We might need/want to decouple context here by either: - * callout_reset(&SCAN_PRIVATE(ss)->ss_scan_timer, 0, scan_next, ss); - * or using a taskqueue. Let's see what kind of problems direct - * dispatch has for now. - */ - IEEE80211_LOCK(ic); - scan_next(ic->ic_scan); - IEEE80211_UNLOCK(ic); + callout_reset(&SCAN_PRIVATE(ss)->ss_scan_timer, 0, scan_next, ss); } /* @@ -881,6 +874,8 @@ { struct ieee80211vap *vap = ss->ss_vap; + IEEE80211_LOCK_ASSERT(vap->iv_ic); + if (ss->ss_flags & IEEE80211_SCAN_ACTIVE) ieee80211_probe_curchan(vap, 0); callout_reset(&SCAN_PRIVATE(ss)->ss_scan_timer, From owner-p4-projects@FreeBSD.ORG Sat Apr 5 23:35:55 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6BB6E1065675; Sat, 5 Apr 2008 23:35:55 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2CE4F106566B for <perforce@freebsd.org>; Sat, 5 Apr 2008 23:35:55 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1031A8FC0C for <perforce@freebsd.org>; Sat, 5 Apr 2008 23:35:55 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m35NZtX9074916 for <perforce@freebsd.org>; Sat, 5 Apr 2008 23:35:55 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m35NZseK074914 for perforce@freebsd.org; Sat, 5 Apr 2008 23:35:54 GMT (envelope-from sam@freebsd.org) Date: Sat, 5 Apr 2008 23:35:54 GMT Message-Id: <200804052335.m35NZseK074914@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler <sam@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Cc: Subject: PERFORCE change 139438 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 05 Apr 2008 23:35:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=139438 Change 139438 by sam@sam_ebb on 2008/04/05 23:35:37 Checkpoint major overhaul now that we're back to sta operation (open and w/ wpa): o move if_alloc up to simplify work o cleanup iwi_detach; still need to eliminate it's use in iwi_attach o move firmware get into vap create so we don't need to drop the softc lock in iwi_init o add task bounces for iwi_notification_intr calls back into net80211 to eliminate LOR's o rewrite iwi_newstate to use split state machine handling mechanism and inline expand routines that just toss requests to the task queue to make logic more explicit o eliminate bogus call to ieee80211_node_authorize; this was wrong for WPA and should never be done by the driver o tighten up some code (Andrew, you really like blank lines, eh? :)) o move check of IFF_DRV_RUNNING on firmware error to the task queue to avoid inconsistent state o make iwi_raw_xmit just discard frames; there's no way to send raw 802.11 frames with this device and trying to cause the firmware to barf o eliminate "wait until pending iwi_cmds are completed" logic in iwi_ioctl; we are now called from the 802.11 layer and there should never be cmds pending if we have done the right work wrt the cmd queues, firmware state, and taskqueue o block/unblock task queues instead of trying to drain them; this fixes various races in the handling of reset I believe o display symbolic names for fw states in debug msgs o never never touch IFF_UP o expand iwi_queue_cmd to pass an opaque argument through so the state machine changes can be directly mimic the 802.11 layer requests o add IWI_AUTH so we can explicitly track the state machine Affected files ... .. //depot/projects/vap/sys/dev/iwi/if_iwi.c#17 edit .. //depot/projects/vap/sys/dev/iwi/if_iwivar.h#11 edit Differences ... ==== //depot/projects/vap/sys/dev/iwi/if_iwi.c#17 (text+ko) ==== @@ -91,6 +91,14 @@ #define DPRINTFN(n, x) do { if (iwi_debug >= (n)) printf x; } while (0) int iwi_debug = 0; SYSCTL_INT(_debug, OID_AUTO, iwi, CTLFLAG_RW, &iwi_debug, 0, "iwi debug level"); + +static const char *iwi_fw_states[] = { + "IDLE", /* IWI_FW_IDLE */ + "LOADING", /* IWI_FW_LOADING */ + "ASSOCIATING", /* IWI_FW_ASSOCIATING */ + "DISASSOCIATING", /* IWI_FW_DISASSOCIATING */ + "SCANNING", /* IWI_FW_SCANNING */ +}; #else #define DPRINTF(x) #define DPRINTFN(n, x) @@ -144,11 +152,15 @@ static void iwi_media_status(struct ifnet *, struct ifmediareq *); static int iwi_newstate(struct ieee80211vap *, enum ieee80211_state, int); static void iwi_wme_init(struct iwi_softc *); -static int iwi_wme_setparams(struct iwi_softc *); +static int iwi_wme_setparams(struct iwi_softc *, struct ieee80211com *); static int iwi_wme_update(struct ieee80211com *); static uint16_t iwi_read_prom_word(struct iwi_softc *, uint8_t); static void iwi_frame_intr(struct iwi_softc *, struct iwi_rx_data *, int, struct iwi_frame *); +static void iwi_bmiss(void *, int); +static void iwi_authsuccess(void *, int); +static void iwi_assocsuccess(void *, int); +static void iwi_assocfailed(void *, int); static void iwi_notification_intr(struct iwi_softc *, struct iwi_notif *); static void iwi_rx_intr(struct iwi_softc *); static void iwi_tx_intr(struct iwi_softc *, struct iwi_tx_ring *); @@ -159,6 +171,7 @@ struct ieee80211_node *, int); static int iwi_raw_xmit(struct ieee80211_node *, struct mbuf *, const struct ieee80211_bpf_params *); +static void iwi_start_locked(struct ifnet *); static void iwi_start(struct ifnet *); static void iwi_watchdog(void *); static int iwi_ioctl(struct ifnet *, u_long, caddr_t); @@ -167,8 +180,8 @@ static int iwi_load_ucode(struct iwi_softc *, const struct iwi_fw *); static int iwi_load_firmware(struct iwi_softc *, const struct iwi_fw *); static void iwi_release_fw_dma(struct iwi_softc *sc); -static int iwi_config(struct iwi_softc *); -static int iwi_get_firmware(struct iwi_softc *); +static int iwi_config(struct iwi_softc *, struct ieee80211vap *); +static int iwi_get_firmware(struct iwi_softc *, enum ieee80211_opmode); static void iwi_put_firmware(struct iwi_softc *); static int iwi_scanchan(struct iwi_softc *, unsigned long, int); static void iwi_scan_start(struct ieee80211com *); @@ -180,15 +193,14 @@ static void iwi_scan_allchan(struct ieee80211com *, unsigned long maxdwell); #endif static void iwi_scan_mindwell(struct ieee80211_scan_state *); -static void iwi_assoc(struct ieee80211vap *); -static void iwi_disassoc(struct ieee80211vap *); static void iwi_ops(void *, int); -static int iwi_queue_cmd(struct iwi_softc *, int); +static int iwi_queue_cmd(struct iwi_softc *, int, int); static int iwi_auth_and_assoc(struct iwi_softc *, struct ieee80211vap *); static int iwi_disassociate(struct iwi_softc *, int quiet); static void iwi_init(void *); -static void iwi_init_locked(void *, int); -static void iwi_stop(void *); +static int iwi_init_fw_dma(struct iwi_softc *, int); +static void iwi_stop_locked(void *); +static void iwi_stop(struct iwi_softc *); static void iwi_restart(void *, int); static int iwi_getrfkill(struct iwi_softc *); static void iwi_radio_on(void *, int); @@ -270,6 +282,13 @@ sc->sc_dev = dev; + ifp = sc->sc_ifp = if_alloc(IFT_IEEE80211); + if (ifp == NULL) { + device_printf(dev, "can not if_alloc()\n"); + return ENXIO; + } + ic = ifp->if_l2com; + IWI_LOCK_INIT(sc); IWI_CMD_LOCK_INIT(sc); @@ -352,12 +371,7 @@ iwi_wme_init(sc); - ifp = sc->sc_ifp = if_alloc(IFT_IEEE80211); - if (ifp == NULL) { - device_printf(dev, "can not if_alloc()\n"); - goto fail; - } - ic = ifp->if_l2com; + TASK_INIT(&sc->sc_bmiss_task, 0, iwi_bmiss, ic); ifp->if_softc = sc; if_initname(ifp, device_get_name(dev), device_get_unit(dev)); @@ -446,8 +460,9 @@ ieee80211_announce(ic); return 0; - -fail: iwi_detach(dev); +fail: + /* XXX fix */ + iwi_detach(dev); return ENXIO; } @@ -457,17 +472,16 @@ struct iwi_softc *sc = device_get_softc(dev); struct ifnet *ifp = sc->sc_ifp; struct ieee80211com *ic = ifp->if_l2com; - IWI_LOCK_DECL; + + iwi_stop(sc); + + bpfdetach(ifp); + ieee80211_ifdetach(ic); - if (ifp != NULL) { - IWI_LOCK(sc); - iwi_stop(sc); - IWI_UNLOCK(sc); - bpfdetach(ifp); - ieee80211_ifdetach(ic); - } + /* NB: do early to drain any pending tasks */ + taskqueue_free(sc->sc_tq); + taskqueue_free(sc->sc_tq2); - callout_drain(&sc->sc_wdtimer); iwi_put_firmware(sc); iwi_release_fw_dma(sc); @@ -478,26 +492,18 @@ iwi_free_tx_ring(sc, &sc->txq[3]); iwi_free_rx_ring(sc, &sc->rxq); - if (sc->irq != NULL) { - bus_teardown_intr(dev, sc->irq, sc->sc_ih); - bus_release_resource(dev, SYS_RES_IRQ, sc->irq_rid, sc->irq); - } + bus_teardown_intr(dev, sc->irq, sc->sc_ih); + bus_release_resource(dev, SYS_RES_IRQ, sc->irq_rid, sc->irq); - if (sc->mem != NULL) - bus_release_resource(dev, SYS_RES_MEMORY, sc->mem_rid, sc->mem); + bus_release_resource(dev, SYS_RES_MEMORY, sc->mem_rid, sc->mem); - if (ifp != NULL) - if_free(ifp); - - taskqueue_free(sc->sc_tq); - taskqueue_free(sc->sc_tq2); - - if (sc->sc_unr != NULL) - delete_unrhdr(sc->sc_unr); + delete_unrhdr(sc->sc_unr); IWI_LOCK_DESTROY(sc); IWI_CMD_LOCK_DESTROY(sc); + if_free(ifp); + return 0; } @@ -507,11 +513,29 @@ const uint8_t bssid[IEEE80211_ADDR_LEN], const uint8_t mac[IEEE80211_ADDR_LEN]) { + struct ifnet *ifp = ic->ic_ifp; + struct iwi_softc *sc = ifp->if_softc; struct iwi_vap *ivp; struct ieee80211vap *vap; + int i; if (!TAILQ_EMPTY(&ic->ic_vaps)) /* only one at a time */ return NULL; + /* + * Get firmware image (and possibly dma memory) on mode change. + */ + if (iwi_get_firmware(sc, opmode)) + return NULL; + /* allocate DMA memory for mapping firmware image */ + i = sc->fw_fw.size; + if (sc->fw_boot.size > i) + i = sc->fw_boot.size; + /* XXX do we dma the ucode as well ? */ + if (sc->fw_uc.size > i) + i = sc->fw_uc.size; + if (iwi_init_fw_dma(sc, i)) + return NULL; + ivp = (struct iwi_vap *) malloc(sizeof(struct iwi_vap), M_80211_VAP, M_NOWAIT | M_ZERO); if (ivp == NULL) @@ -523,6 +547,10 @@ ivp->iwi_newstate = vap->iv_newstate; vap->iv_newstate = iwi_newstate; + TASK_INIT(&ivp->iwi_authsuccess_task, 0, iwi_authsuccess, vap); + TASK_INIT(&ivp->iwi_assocsuccess_task, 0, iwi_assocsuccess, vap); + TASK_INIT(&ivp->iwi_assocfailed_task, 0, iwi_assocfailed, vap); + /* complete setup */ ieee80211_vap_attach(vap, ieee80211_media_change, iwi_media_status); ic->ic_opmode = opmode; @@ -840,11 +868,8 @@ iwi_shutdown(device_t dev) { struct iwi_softc *sc = device_get_softc(dev); - IWI_LOCK_DECL; - IWI_LOCK(sc); iwi_stop(sc); - IWI_UNLOCK(sc); iwi_put_firmware(sc); /* ??? XXX */ return 0; @@ -854,11 +879,8 @@ iwi_suspend(device_t dev) { struct iwi_softc *sc = device_get_softc(dev); - IWI_LOCK_DECL; - IWI_LOCK(sc); iwi_stop(sc); - IWI_UNLOCK(sc); return 0; } @@ -962,19 +984,36 @@ struct ieee80211com *ic = vap->iv_ic; struct ifnet *ifp = ic->ic_ifp; struct iwi_softc *sc = ifp->if_softc; - int error = 0; + IWI_LOCK_DECL; DPRINTF(("%s: %s -> %s flags 0x%x\n", __func__, ieee80211_state_name[vap->iv_state], ieee80211_state_name[nstate], sc->flags)); - /* XXX state change race with taskqueue */ switch (nstate) { + case IEEE80211_S_INIT: + IWI_LOCK(sc); + /* + * NB: don't try to do this if iwi_stop_master has + * shutdown the firmware and disabled interrupts. + */ + if (vap->iv_state == IEEE80211_S_RUN && + (sc->flags & IWI_FLAG_FW_INITED)) + iwi_queue_cmd(sc, IWI_DISASSOC, 0); + IWI_UNLOCK(sc); + break; + case IEEE80211_S_SCAN: + iwi_queue_cmd(sc, IWI_CONFIG, 0); + return EINPROGRESS; case IEEE80211_S_AUTH: - iwi_assoc(vap); - break; + /* The firmware will fail if we are already associated */ + if (sc->flags & IWI_FLAG_ASSOCIATED) + iwi_queue_cmd(sc, IWI_DISASSOC, 0); + iwi_queue_cmd(sc, IWI_AUTH, arg); + return EINPROGRESS; case IEEE80211_S_RUN: - if (vap->iv_opmode == IEEE80211_M_IBSS) { + if (vap->iv_opmode == IEEE80211_M_IBSS && + vap->iv_state == IEEE80211_S_SCAN) { /* * XXX when joining an ibss network we are called * with a SCAN -> RUN transition on scan complete. @@ -983,35 +1022,27 @@ * AUTH -> RUN transition and we want to do nothing. * This is all totally bogus and needs to be redone. */ - if (vap->iv_state == IEEE80211_S_SCAN) - iwi_assoc(vap); - } + iwi_queue_cmd(sc, IWI_ASSOC, 0); + return EINPROGRESS; + } break; - case IEEE80211_S_INIT: - /* - * NB: don't try to do this if iwi_stop_master has - * shutdown the firmware and disabled interrupts. - */ - if (vap->iv_state == IEEE80211_S_RUN && - (sc->flags & IWI_FLAG_FW_INITED)) - iwi_disassoc(vap); - if (vap->iv_state == IEEE80211_S_SCAN && - (sc->fw_state == IWI_FW_SCANNING)) - ieee80211_cancel_scan(vap); - break; case IEEE80211_S_ASSOC: /* - * If we are not transitioning from AUTH the resend the - * association request. + * If we are transitioning from AUTH then just wait + * for the ASSOC status to come back from the firmware. + * Otherwise we need to issue the association request. */ - if (vap->iv_state != IEEE80211_S_AUTH) - iwi_assoc(vap); - break; + if (vap->iv_state == IEEE80211_S_AUTH) + break; + /* The firmware will fail if we are already associated */ + if (sc->flags & IWI_FLAG_ASSOCIATED) + iwi_queue_cmd(sc, IWI_DISASSOC, 0); + iwi_queue_cmd(sc, IWI_ASSOC, arg); + return EINPROGRESS; default: break; } - return (error != 0) ? error : ivp->iwi_newstate(vap, nstate, arg); - + return ivp->iwi_newstate(vap, nstate, arg); } /* @@ -1062,10 +1093,8 @@ } static int -iwi_wme_setparams(struct iwi_softc *sc) +iwi_wme_setparams(struct iwi_softc *sc, struct ieee80211com *ic) { - struct ifnet *ifp = sc->sc_ifp; - struct ieee80211com *ic = ifp->if_l2com; const struct wmeParams *wmep; int ac; @@ -1098,7 +1127,7 @@ * will get sent down to the adapter as part of the * work iwi_auth_and_assoc does. */ - return (iwi_queue_cmd(sc, IWI_SET_WME)); + return iwi_queue_cmd(sc, IWI_SET_WME, 0); } static int @@ -1367,7 +1396,42 @@ #undef SUBTYPE } +/* + * Task queue callbacks for iwi_notification_intr used to avoid LOR's. + */ +static void +iwi_bmiss(void *arg, int npending) +{ + struct ieee80211com *ic = arg; + + ieee80211_beacon_miss(ic); +} + +static void +iwi_authsuccess(void *arg, int npending) +{ + struct ieee80211vap *vap = arg; + + ieee80211_new_state(vap, IEEE80211_S_ASSOC, -1); +} + static void +iwi_assocsuccess(void *arg, int npending) +{ + struct ieee80211vap *vap = arg; + + ieee80211_new_state(vap, IEEE80211_S_RUN, -1); +} + +static void +iwi_assocfailed(void *arg, int npending) +{ + struct ieee80211vap *vap = arg; + + ieee80211_new_state(vap, IEEE80211_S_SCAN, -1); +} + +static void iwi_notification_intr(struct iwi_softc *sc, struct iwi_notif *notif) { struct ifnet *ifp = sc->sc_ifp; @@ -1398,54 +1462,49 @@ IWI_STATE_END(sc, IWI_FW_SCANNING); - if (scan->status == IWI_SCAN_COMPLETED) + if (scan->status == IWI_SCAN_COMPLETED) { + /* NB: don't need to defer, net80211 does it for us */ ieee80211_scan_next(vap); - + } break; case IWI_NOTIF_TYPE_AUTHENTICATION: auth = (struct iwi_notif_authentication *)(notif + 1); - switch (auth->state) { case IWI_AUTH_SUCCESS: DPRINTFN(2, ("Authentication succeeeded\n")); - ieee80211_node_authorize(vap->iv_bss); - ieee80211_new_state(vap, IEEE80211_S_ASSOC, -1); + taskqueue_enqueue(taskqueue_swi, + &IWI_VAP(vap)->iwi_authsuccess_task); break; - case IWI_AUTH_FAIL: DPRINTFN(2, ("Authentication failed\n")); sc->flags &= ~IWI_FLAG_ASSOCIATED; IWI_STATE_END(sc, IWI_FW_ASSOCIATING); /* XXX */ break; - case IWI_AUTH_SENT_1: case IWI_AUTH_RECV_2: case IWI_AUTH_SEQ1_PASS: break; - case IWI_AUTH_SEQ1_FAIL: DPRINTFN(2, ("Initial authentication handshake failed; " "you probably need shared key\n")); IWI_STATE_END(sc, IWI_FW_ASSOCIATING); /* XXX retry shared key when in auto */ break; - default: device_printf(sc->sc_dev, "unknown authentication state %u\n", auth->state); + break; } break; case IWI_NOTIF_TYPE_ASSOCIATION: assoc = (struct iwi_notif_association *)(notif + 1); - switch (assoc->state) { case IWI_AUTH_SUCCESS: /* re-association, do nothing */ break; - case IWI_ASSOC_SUCCESS: DPRINTFN(2, ("Association succeeded\n")); sc->flags |= IWI_FLAG_ASSOCIATED; @@ -1453,30 +1512,30 @@ iwi_checkforqos(vap, (const struct ieee80211_frame *)(assoc+1), le16toh(notif->len) - sizeof(*assoc)); - ieee80211_new_state(vap, IEEE80211_S_RUN, -1); + taskqueue_enqueue(taskqueue_swi, + &IWI_VAP(vap)->iwi_assocsuccess_task); break; - case IWI_ASSOC_INIT: switch (sc->fw_state) { - case IWI_FW_ASSOCIATING: - DPRINTFN(2, ("Association failed\n")); - IWI_STATE_END(sc, IWI_FW_ASSOCIATING); - ieee80211_new_state(vap, - IEEE80211_S_SCAN, -1); - break; + case IWI_FW_ASSOCIATING: + DPRINTFN(2, ("Association failed\n")); + IWI_STATE_END(sc, IWI_FW_ASSOCIATING); + taskqueue_enqueue(taskqueue_swi, + &IWI_VAP(vap)->iwi_assocfailed_task); + break; - case IWI_FW_DISASSOCIATING: - DPRINTFN(2, ("Dissassociated\n")); - IWI_STATE_END(sc, - IWI_FW_DISASSOCIATING); - break; + case IWI_FW_DISASSOCIATING: + DPRINTFN(2, ("Dissassociated\n")); + IWI_STATE_END(sc, + IWI_FW_DISASSOCIATING); + break; } sc->flags &= ~IWI_FLAG_ASSOCIATED; break; - default: device_printf(sc->sc_dev, "unknown association state %u\n", assoc->state); + break; } break; @@ -1499,7 +1558,8 @@ DPRINTF(("Beacon miss: %u >= %u\n", le32toh(beacon->number), vap->iv_bmissthreshold)); - ieee80211_beacon_miss(ic); + taskqueue_enqueue(taskqueue_swi, + &sc->sc_bmiss_task); } } break; @@ -1513,6 +1573,7 @@ default: DPRINTF(("unknown notification type %u flags 0x%x len %u\n", notif->type, notif->flags, le16toh(notif->len))); + break; } } @@ -1595,7 +1656,7 @@ if (sc->sc_softled) iwi_led_event(sc, IWI_LED_TX); - iwi_start(ifp); + iwi_start_locked(ifp); } static void @@ -1617,9 +1678,7 @@ if (r & IWI_INTR_FATAL_ERROR) { device_printf(sc->sc_dev, "firmware error\n"); - /* don't restart if the interface isn't up */ - if (sc->sc_ifp->if_drv_flags & IFF_DRV_RUNNING) - taskqueue_enqueue(sc->sc_tq2, &sc->sc_restarttask); + taskqueue_enqueue(sc->sc_tq2, &sc->sc_restarttask); sc->flags &= ~IWI_FLAG_BUSY; sc->sc_busy_timer = 0; @@ -1884,60 +1943,24 @@ iwi_raw_xmit(struct ieee80211_node *ni, struct mbuf *m, const struct ieee80211_bpf_params *params) { - struct ieee80211com *ic = ni->ni_ic; - struct ifnet *ifp = ic->ic_ifp; - struct iwi_softc *sc = ifp->if_softc; - int ac; - IWI_LOCK_DECL; - - IWI_LOCK(sc); - - /* prevent management frames from being sent if we're not ready */ - if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) { - IWI_UNLOCK(sc); - m_freem(m); - ieee80211_free_node(ni); - return ENETDOWN; - } - ac = M_WME_GETAC(m); - if (sc->txq[ac].queued > IWI_TX_RING_COUNT - 8) { - ifp->if_drv_flags |= IFF_DRV_OACTIVE; - IWI_UNLOCK(sc); - m_freem(m); - ieee80211_free_node(ni); - return ENOBUFS; /* XXX */ - } - - BPF_MTAP(ifp, m); - - /* XXX honor params */ - if (iwi_tx_start(ifp, m, ni, ac) != 0) { - ieee80211_free_node(ni); - ifp->if_oerrors++; - IWI_UNLOCK(sc); - return EIO; - } - - IWI_UNLOCK(sc); - + /* no support; just discard */ + m_freem(m); + ieee80211_free_node(ni); return 0; } static void -iwi_start(struct ifnet *ifp) +iwi_start_locked(struct ifnet *ifp) { struct iwi_softc *sc = ifp->if_softc; struct mbuf *m; struct ieee80211_node *ni; int ac; - IWI_LOCK_DECL; - IWI_LOCK(sc); + IWI_LOCK_ASSERT(sc); - if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) { - IWI_UNLOCK(sc); + if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) return; - } for (;;) { IFQ_DRV_DEQUEUE(&ifp->if_snd, m); @@ -1970,7 +1993,16 @@ sc->sc_tx_timer = 5; } +} + +static void +iwi_start(struct ifnet *ifp) +{ + struct iwi_softc *sc = ifp->if_softc; + IWI_LOCK_DECL; + IWI_LOCK(sc); + iwi_start_locked(ifp); IWI_UNLOCK(sc); } @@ -2032,22 +2064,12 @@ struct ieee80211com *ic = ifp->if_l2com; struct ifreq *ifr = (struct ifreq *) data; int error = 0; - IWI_LOCK_DECL; - IWI_LOCK(sc); - - /* - * wait until pending iwi_cmd() are completed, to avoid races - * that could cause problems. - */ - while (sc->flags & IWI_FLAG_BUSY) - msleep(sc, &sc->sc_mtx, 0, "iwiioctl", hz); - switch (cmd) { case SIOCSIFFLAGS: if (ifp->if_flags & IFF_UP) { if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) - iwi_init_locked(sc, 0); + iwi_init(sc); } else { if (ifp->if_drv_flags & IFF_DRV_RUNNING) iwi_stop(sc); @@ -2067,10 +2089,8 @@ break; default: error = ether_ioctl(ifp, cmd, data); + break; } - - IWI_UNLOCK(sc); - return error; } @@ -2204,31 +2224,26 @@ * the boot firmware as "master". */ static int -iwi_get_firmware(struct iwi_softc *sc) +iwi_get_firmware(struct iwi_softc *sc, enum ieee80211_opmode opmode) { - struct ifnet *ifp = sc->sc_ifp; - struct ieee80211com *ic = ifp->if_l2com; const struct iwi_firmware_hdr *hdr; const struct firmware *fp; /* invalidate cached firmware on mode change */ - if (sc->fw_mode != ic->ic_opmode) + if (sc->fw_mode != opmode) iwi_put_firmware(sc); - switch (ic->ic_opmode) { + switch (opmode) { case IEEE80211_M_STA: iwi_getfw(&sc->fw_fw, "iwi_bss", &sc->fw_uc, "iwi_ucode_bss"); break; - case IEEE80211_M_IBSS: iwi_getfw(&sc->fw_fw, "iwi_ibss", &sc->fw_uc, "iwi_ucode_ibss"); break; - case IEEE80211_M_MONITOR: iwi_getfw(&sc->fw_fw, "iwi_monitor", &sc->fw_uc, "iwi_ucode_monitor"); break; - default: break; } @@ -2308,7 +2323,7 @@ sc->fw_boot.size, sc->fw_uc.size, sc->fw_fw.size); #endif - sc->fw_mode = ic->ic_opmode; + sc->fw_mode = opmode; return 0; bad: iwi_put_firmware(sc); @@ -2421,6 +2436,7 @@ int ntries, error; IWI_LOCK_ASSERT(sc); + /* copy firmware image to DMA memory */ memcpy(sc->fw_virtaddr, fw->data, fw->size); @@ -2551,16 +2567,16 @@ } static int -iwi_config(struct iwi_softc *sc) +iwi_config(struct iwi_softc *sc, struct ieee80211vap *vap) { struct ifnet *ifp = sc->sc_ifp; struct ieee80211com *ic = ifp->if_l2com; - struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps); struct iwi_configuration config; struct iwi_rateset rs; struct iwi_txpower power; uint32_t data; int error, i; + IWI_LOCK_ASSERT(sc); IEEE80211_ADDR_COPY(vap->iv_myaddr, IF_LLADDR(ifp)); @@ -2924,13 +2940,13 @@ if ((vap->iv_flags & IEEE80211_F_WME) && ni->ni_ies.wme_ie != NULL) { /* NB: don't treat WME setup as failure */ - if (iwi_wme_setparams(sc) == 0 && iwi_wme_setie(sc) == 0) + if (iwi_wme_setparams(sc, ic) == 0 && iwi_wme_setie(sc) == 0) assoc->policy |= htole16(IWI_POLICY_WME); /* XXX complain on failure? */ } - if (vap->iv_appie_assocreq != NULL) { - struct ieee80211_appie *ie = vap->iv_appie_assocreq; + if (vap->iv_appie_wpa != NULL) { + struct ieee80211_appie *ie = vap->iv_appie_wpa; DPRINTF(("Setting optional IE (len=%u)\n", ie->ie_len)); error = iwi_cmd(sc, IWI_CMD_SET_OPTIE, ie->ie_data, ie->ie_len); @@ -3030,17 +3046,6 @@ return iwi_cmd(sc, IWI_CMD_ASSOCIATE, assoc, sizeof *assoc); } -static void -iwi_init(void *priv) -{ - struct iwi_softc *sc = priv; - IWI_LOCK_DECL; - - IWI_LOCK(sc); - iwi_init_locked(sc, 0); - IWI_UNLOCK(sc); -} - /* * release dma resources for the firmware */ @@ -3102,7 +3107,7 @@ } static void -iwi_init_locked(void *priv, int force) +iwi_init(void *priv) { struct iwi_softc *sc = priv; struct ifnet *ifp = sc->sc_ifp; @@ -3111,45 +3116,30 @@ int i; IWI_LOCK_DECL; - IWI_LOCK_ASSERT(sc); + IWI_LOCK(sc); + if (sc->fw_state == IWI_FW_LOADING) { + IWI_UNLOCK(sc); device_printf(sc->sc_dev, "%s: already loading\n", __func__); return; /* XXX: condvar? */ } - iwi_stop(sc); + iwi_stop_locked(sc); + IWI_STATE_BEGIN(sc, IWI_FW_LOADING); + taskqueue_unblock(sc->sc_tq); + taskqueue_unblock(sc->sc_tq2); + if (iwi_reset(sc) != 0) { device_printf(sc->sc_dev, "could not reset adapter\n"); goto fail; } - - IWI_UNLOCK(sc); - if (iwi_get_firmware(sc)) { - IWI_LOCK(sc); - goto fail; - } - - /* allocate DMA memory for mapping firmware image */ - i = sc->fw_fw.size; - if (sc->fw_boot.size > i) - i = sc->fw_boot.size; - /* XXX do we dma the ucode as well ? */ - if (sc->fw_uc.size > i) - i = sc->fw_uc.size; - if (iwi_init_fw_dma(sc, i)) { - IWI_LOCK(sc); - goto fail; - } - IWI_LOCK(sc); - if (iwi_load_firmware(sc, &sc->fw_boot) != 0) { device_printf(sc->sc_dev, "could not load boot firmware %s\n", sc->fw_boot.name); goto fail; } - if (iwi_load_ucode(sc, &sc->fw_uc) != 0) { device_printf(sc->sc_dev, "could not load microcode %s\n", sc->fw_uc.name); @@ -3192,39 +3182,40 @@ } sc->flags |= IWI_FLAG_FW_INITED; - if (iwi_config(sc) != 0) { - device_printf(sc->sc_dev, "device configuration failed\n"); - goto fail; - } - callout_reset(&sc->sc_wdtimer, hz, iwi_watchdog, sc); ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; ifp->if_drv_flags |= IFF_DRV_RUNNING; + IWI_STATE_END(sc, IWI_FW_LOADING); + + IWI_UNLOCK(sc); + ieee80211_start_all(ic); /* start all vap's */ - - IWI_STATE_END(sc, IWI_FW_LOADING); return; - -fail: ifp->if_flags &= ~IFF_UP; +fail: IWI_STATE_END(sc, IWI_FW_LOADING); - iwi_stop(sc); - iwi_put_firmware(sc); + iwi_stop_locked(sc); + IWI_UNLOCK(sc); } static void -iwi_stop(void *priv) +iwi_stop_locked(void *priv) { struct iwi_softc *sc = priv; struct ifnet *ifp = sc->sc_ifp; IWI_LOCK_ASSERT(sc); + + ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE); + + taskqueue_block(sc->sc_tq); + taskqueue_block(sc->sc_tq2); if (sc->sc_softled) { callout_stop(&sc->sc_ledtimer); sc->sc_blinking = 0; } + callout_stop(&sc->sc_wdtimer); - callout_stop(&sc->sc_wdtimer); iwi_stop_master(sc); CSR_WRITE_4(sc, IWI_CSR_RST, IWI_RST_SOFT_RESET); @@ -3237,8 +3228,6 @@ iwi_reset_tx_ring(sc, &sc->txq[3]); iwi_reset_rx_ring(sc, &sc->rxq); - ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE); - memset(sc->sc_cmd, 0, sizeof(sc->sc_cmd)); sc->sc_tx_timer = 0; sc->sc_rfkill_timer = 0; @@ -3250,13 +3239,25 @@ } static void +iwi_stop(struct iwi_softc *sc) +{ + IWI_LOCK_DECL; + + IWI_LOCK(sc); + iwi_stop_locked(sc); + IWI_UNLOCK(sc); +} + +static void iwi_restart(void *arg, int npending) { struct iwi_softc *sc = arg; IWI_LOCK_DECL; IWI_LOCK(sc); - iwi_init_locked(sc, 1); /* NB: force state machine */ + /* XXX not right */ + if (sc->sc_ifp->if_drv_flags & IFF_DRV_RUNNING) + iwi_init(sc); IWI_UNLOCK(sc); } @@ -3276,6 +3277,7 @@ struct iwi_softc *sc = arg; device_printf(sc->sc_dev, "radio turned on\n"); + iwi_init(sc); } @@ -3286,8 +3288,9 @@ IWI_LOCK_DECL; device_printf(sc->sc_dev, "radio turned off\n"); + IWI_LOCK(sc); - iwi_stop(sc); + iwi_stop_locked(sc); sc->sc_rfkill_timer = 2; IWI_UNLOCK(sc); } @@ -3535,14 +3538,14 @@ } static void -iwi_ops(void *arg, int npending) +iwi_ops(void *arg0, int npending) { - struct iwi_softc *sc = arg; + struct iwi_softc *sc = arg0; struct ifnet *ifp = sc->sc_ifp; struct ieee80211com *ic = ifp->if_l2com; struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps); IWI_LOCK_DECL; - int cmd; + int cmd, arg; again: IWI_CMD_LOCK(sc); @@ -3552,6 +3555,7 @@ IWI_CMD_UNLOCK(sc); return; } + arg = sc->sc_cmd[sc->sc_cmd_cur]; sc->sc_cmd[sc->sc_cmd_cur] = 0; /* free the slot */ sc->sc_cmd_cur = (sc->sc_cmd_cur + 1) % IWI_CMD_MAXOPS; >>> TRUNCATED FOR MAIL (1000 lines) <<<