From owner-p4-projects@FreeBSD.ORG Sun Apr 24 18:49:20 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 94A4E1065675; Sun, 24 Apr 2011 18:49: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 557F21065674 for ; Sun, 24 Apr 2011 18:49:20 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 3FD498FC17 for ; Sun, 24 Apr 2011 18:49:20 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p3OInKC3079157 for ; Sun, 24 Apr 2011 18:49:20 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p3OInG39079153 for perforce@freebsd.org; Sun, 24 Apr 2011 18:49:16 GMT (envelope-from trasz@freebsd.org) Date: Sun, 24 Apr 2011 18:49:16 GMT Message-Id: <201104241849.p3OInG39079153@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 192036 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2011 18:49:20 -0000 http://p4web.freebsd.org/@@192036?ac=10 Change 192036 by trasz@trasz_victim on 2011/04/24 18:48:34 IFC. Affected files ... .. //depot/projects/soc2009/trasz_limits/Makefile#15 integrate .. //depot/projects/soc2009/trasz_limits/Makefile.inc1#26 integrate .. //depot/projects/soc2009/trasz_limits/ObsoleteFiles.inc#36 integrate .. //depot/projects/soc2009/trasz_limits/UPDATING#36 integrate .. //depot/projects/soc2009/trasz_limits/bin/ps/keyword.c#9 integrate .. //depot/projects/soc2009/trasz_limits/bin/ps/ps.1#12 integrate .. //depot/projects/soc2009/trasz_limits/bin/ps/ps.c#6 integrate .. //depot/projects/soc2009/trasz_limits/bin/ps/ps.h#3 integrate .. //depot/projects/soc2009/trasz_limits/bin/setfacl/setfacl.1#6 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/parser.c#21 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bsnmp/snmpd/main.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/CHANGES#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/VERSION#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/aclocal.m4#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/argv.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/dialog/arrows.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/buttons.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/calendar.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/checklist.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/columns.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/config.guess#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/config.sub#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/configure#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/configure.in#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/dialog-config.in#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/dialog.1#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/dialog.3#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/dialog.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/dialog.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/dlg_colors.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/fselect.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/guage.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/headers-sh.in#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/inputstr.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/makefile.in#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/menubox.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/mixedgauge.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/package/debian/changelog#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/dialog/package/debian/compat#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/dialog/package/debian/control#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/dialog/package/debian/copyright#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/dialog/package/debian/docs#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/dialog/package/debian/rules#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/dialog/package/debian/source/format#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/dialog/package/debian/watch#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/dialog/package/dialog.spec#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/dialog/pause.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/ar.po#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/bg.po#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/ca.po#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/cy.po#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/da.po#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/de.po#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/dialog.pot#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/eo.po#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/es.po#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/eu.po#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/fi.po#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/fr.po#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/ga.po#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/gl.po#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/hr.po#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/id.po#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/is.po#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/it.po#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/ja.po#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/ku.po#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/lt.po#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/lv.po#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/makefile.inn#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/ms.po#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/nl.po#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/pl.po#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/pt_BR.po#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/ru.po#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/sl.po#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/sq.po#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/sv.po#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/sw.po#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/th.po#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/zh_CN.po#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/zh_TW.po#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/prgbox.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/dialog/progressbox.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/rename.sh#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/debian.rc#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/infobox5#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/infobox6#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/msgbox-utf8#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/pause-both#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/pause-extra#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/prgbox#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/prgbox2#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/programbox#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/programbox2#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/setup-vars#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/shortlist#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/slackware.rc#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/sourcemage.rc#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/suse.rc#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/textbox-both#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/textbox-help#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/whiptail.rc#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/tailbox.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/textbox.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/timebox.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/trace.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/ui_getc.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/dialog/util.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/doc/cpp.1#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/doc/cpp.texi#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/doc/cppenv.texi#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/doc/cppinternals.texi#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/doc/cppopts.texi#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/doc/extend.texi#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/doc/frontends.texi#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/doc/gcc.1#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/doc/gcc.texi#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/doc/invoke.texi#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/doc/objc.texi#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/gcc/doc/sourcebuild.texi#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/doc/standards.texi#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/doc/tm.texi#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/objc/ChangeLog#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/gcc/objc/Make-lang.in#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/gcc/objc/README#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/gcc/objc/config-lang.in#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/gcc/objc/lang-specs.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/gcc/objc/objc-act.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/gcc/objc/objc-act.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/gcc/objc/objc-lang.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/gcc/objc/objc-tree.def#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/ChangeLog#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/Makefile.in#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/NXConstStr.m#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/Object.m#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/Protocol.m#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/README#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/README.threads#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/THREADS#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/THREADS.MACH#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/acinclude.m4#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/aclocal.m4#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/archive.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/class.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/config.h.in#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/configure#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/configure.ac#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/encoding.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/exception.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/gc.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/hash.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/init.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/libobjc.def#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/libobjc_entry.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/linking.m#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/makefile.dos#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/misc.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/nil_method.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/objc/NXConstStr.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/objc/Object.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/objc/Protocol.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/objc/encoding.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/objc/hash.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/objc/objc-api.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/objc/objc-decls.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/objc/objc-list.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/objc/objc.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/objc/runtime.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/objc/sarray.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/objc/thr.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/objc/typedstream.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/objects.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/sarray.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/selector.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/sendmsg.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/thr-dce.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/thr-decosf1.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/thr-irix.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/thr-mach.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/thr-objc.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/thr-os2.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/thr-posix.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/thr-pthreads.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/thr-rtems.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/thr-single.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/thr-solaris.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/thr-vxworks.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/thr-win32.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libobjc/thr.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Basic/Targets.cpp#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/tzdata/southamerica#5 integrate .. //depot/projects/soc2009/trasz_limits/etc/defaults/rc.conf#22 integrate .. //depot/projects/soc2009/trasz_limits/etc/mtree/BSD.include.dist#13 integrate .. //depot/projects/soc2009/trasz_limits/etc/rc.d/devd#4 integrate .. //depot/projects/soc2009/trasz_limits/etc/rc.d/named#6 integrate .. //depot/projects/soc2009/trasz_limits/etc/rc.subr#14 integrate .. //depot/projects/soc2009/trasz_limits/gnu/lib/Makefile#3 integrate .. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/Makefile#5 integrate .. //depot/projects/soc2009/trasz_limits/gnu/lib/libobjc/Makefile#7 delete .. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/cc/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/cc/cc1obj/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/cc/cc_tools/Makefile#5 integrate .. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/cc/doc/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/cc/include/Makefile#4 integrate .. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/man/COPYING#2 delete .. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/man/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/man/Makefile.inc#2 delete .. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/man/README#2 delete .. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/man/TODO#2 delete .. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/man/apropos/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/man/apropos/apropos.man#2 delete .. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/man/apropos/apropos.sh#3 delete .. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/man/lib/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/man/lib/config.h_dist#2 delete .. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/man/lib/gripes.c#2 delete .. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/man/lib/gripes.h#2 delete .. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/man/lib/util.c#2 delete .. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/man/man/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/man/man/glob.c#2 delete .. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/man/man/man.c#2 delete .. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/man/man/man.man#2 delete .. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/man/man/ndir.h#2 delete .. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/man/man/version.h#2 delete .. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/man/manpath/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/man/manpath/manpath.c#2 delete .. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/man/manpath/manpath.config#2 delete .. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/man/manpath/manpath.h#2 delete .. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/man/manpath/manpath.man#2 delete .. //depot/projects/soc2009/trasz_limits/lib/libc/gen/getdiskbyname.3#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/posix1e/acl_support_nfs4.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/rpc/svc_vc.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/sys/Makefile.inc#14 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/sys/Symbol.map#20 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/sys/getfh.2#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/sys/posix_fallocate.2#1 branch .. //depot/projects/soc2009/trasz_limits/lib/libcrypt/Makefile#4 integrate .. //depot/projects/soc2009/trasz_limits/lib/libcrypt/crypt-sha256.c#1 branch .. //depot/projects/soc2009/trasz_limits/lib/libcrypt/crypt-sha512.c#1 branch .. //depot/projects/soc2009/trasz_limits/lib/libcrypt/crypt.3#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libcrypt/crypt.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libcrypt/crypt.h#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libcrypt/misc.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libedit/chartype.h#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libedit/edit/readline/readline.h#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libmd/Makefile#4 integrate .. //depot/projects/soc2009/trasz_limits/lib/libmd/mddriver.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libmd/rmddriver.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libmd/sha512.3#1 branch .. //depot/projects/soc2009/trasz_limits/lib/libmd/sha512.h#1 branch .. //depot/projects/soc2009/trasz_limits/lib/libmd/sha512c.c#1 branch .. //depot/projects/soc2009/trasz_limits/lib/libmd/shadriver.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libthr/thread/thr_once.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libutil/humanize_number.3#4 integrate .. //depot/projects/soc2009/trasz_limits/lib/libutil/humanize_number.c#4 integrate .. //depot/projects/soc2009/trasz_limits/lib/libutil/libutil.h#7 integrate .. //depot/projects/soc2009/trasz_limits/release/Makefile#13 integrate .. //depot/projects/soc2009/trasz_limits/release/generate-release.sh#3 integrate .. //depot/projects/soc2009/trasz_limits/release/rc.local#2 integrate .. //depot/projects/soc2009/trasz_limits/sbin/camcontrol/camcontrol.c#15 integrate .. //depot/projects/soc2009/trasz_limits/sbin/conscontrol/conscontrol.8#2 integrate .. //depot/projects/soc2009/trasz_limits/sbin/conscontrol/conscontrol.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sbin/hastctl/hastctl.8#6 integrate .. //depot/projects/soc2009/trasz_limits/sbin/hastctl/hastctl.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sbin/hastd/activemap.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sbin/hastd/hast_proto.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sbin/hastd/hast_proto.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sbin/hastd/hastd.c#16 integrate .. //depot/projects/soc2009/trasz_limits/sbin/hastd/parse.y#8 integrate .. //depot/projects/soc2009/trasz_limits/sbin/hastd/primary.c#17 integrate .. //depot/projects/soc2009/trasz_limits/sbin/hastd/secondary.c#13 integrate .. //depot/projects/soc2009/trasz_limits/sbin/ifconfig/ifieee80211.c#13 integrate .. //depot/projects/soc2009/trasz_limits/sbin/ipfw/altq.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sbin/ipfw/dummynet.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sbin/ipfw/ipfw2.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sbin/ipfw/ipfw2.h#7 integrate .. //depot/projects/soc2009/trasz_limits/sbin/ipfw/ipv6.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sbin/ipfw/main.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sbin/ipfw/nat.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sbin/natd/natd.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sbin/reboot/boot_i386.8#3 integrate .. //depot/projects/soc2009/trasz_limits/share/doc/smm/07.lpd/0.t#1 branch .. //depot/projects/soc2009/trasz_limits/share/doc/smm/07.lpd/1.t#1 branch .. //depot/projects/soc2009/trasz_limits/share/doc/smm/07.lpd/2.t#1 branch .. //depot/projects/soc2009/trasz_limits/share/doc/smm/07.lpd/3.t#1 branch .. //depot/projects/soc2009/trasz_limits/share/doc/smm/07.lpd/4.t#1 branch .. //depot/projects/soc2009/trasz_limits/share/doc/smm/07.lpd/5.t#1 branch .. //depot/projects/soc2009/trasz_limits/share/doc/smm/07.lpd/6.t#1 branch .. //depot/projects/soc2009/trasz_limits/share/doc/smm/07.lpd/7.t#1 branch .. //depot/projects/soc2009/trasz_limits/share/doc/smm/07.lpd/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/share/doc/smm/07.lpd/spell.ok#1 branch .. //depot/projects/soc2009/trasz_limits/share/doc/smm/07.lpr/0.t#2 delete .. //depot/projects/soc2009/trasz_limits/share/doc/smm/07.lpr/1.t#2 delete .. //depot/projects/soc2009/trasz_limits/share/doc/smm/07.lpr/2.t#2 delete .. //depot/projects/soc2009/trasz_limits/share/doc/smm/07.lpr/3.t#2 delete .. //depot/projects/soc2009/trasz_limits/share/doc/smm/07.lpr/4.t#2 delete .. //depot/projects/soc2009/trasz_limits/share/doc/smm/07.lpr/5.t#2 delete .. //depot/projects/soc2009/trasz_limits/share/doc/smm/07.lpr/6.t#2 delete .. //depot/projects/soc2009/trasz_limits/share/doc/smm/07.lpr/7.t#2 delete .. //depot/projects/soc2009/trasz_limits/share/doc/smm/07.lpr/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/share/doc/smm/07.lpr/spell.ok#2 delete .. //depot/projects/soc2009/trasz_limits/share/doc/smm/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/ARABIC%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/CELTIC%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/CENTEURO%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/CROATIAN%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/CYRILLIC%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/DEVANAGA%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/DINGBATS%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/FARSI%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/GAELIC%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/GREEK%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/GUJARATI%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/GURMUKHI%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/HEBREW%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/ICELAND%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/INUIT%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/KEYBOARD%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/ROMAN%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/ROMANIAN%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/SYMBOL%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/THAI%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/TURKISH%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25ARABIC.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25CELTIC.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25CENTEURO.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25CROATIAN.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25CYRILLIC.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25DEVANAGA.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25DINGBATS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25FARSI.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25GAELIC.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25GREEK.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25GUJARATI.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25GURMUKHI.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25HEBREW.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25ICELAND.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25INUIT.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25KEYBOARD.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25ROMAN.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25ROMANIAN.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25SYMBOL.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25THAI.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25TURKISH.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/AST/ARMSCII-7%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/AST/ARMSCII-8%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/AST/ARMSCII-8A%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/AST/UCS%25ARMSCII-7.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/AST/UCS%25ARMSCII-8.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/AST/UCS%25ARMSCII-8A.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/BIG5/Big5UDA%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/BIG5/UCS%25Big5UDA.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CNS/CNS11643-1%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CNS/CNS11643-2%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CNS/UCS%25CNS11643-1.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CNS/UCS%25CNS11643-2.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP037%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP038%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP10000%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP10006%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP10007%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP10029%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1006%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP10079%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP10081%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1026%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1046%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1124%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1125%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1129%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1131%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1133%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1161%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1162%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1163%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1250%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1251%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1252%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1253%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1254%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1255%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1256%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1257%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1258%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP273%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP274%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP275%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP277%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP278%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP280%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP281%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP284%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP285%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP290%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP297%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP420%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP423%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP424%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP437%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP500%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP737%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP775%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP850%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP851%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP852%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP853%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP855%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP856%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP857%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP858%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP860%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP861%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP862%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP863%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP864%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP865%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP866%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP868%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP869%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP870%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP871%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP874%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP875%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP880%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP891%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP903%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP904%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP905%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP918%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP922%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP932UDA%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP936EXT%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP942EXT%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP949EXT%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP950%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP037.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP038.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP10000.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP10006.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP10007.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP10029.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1006.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP10079.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP10081.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1026.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1046.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1124.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1125.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1129.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1131.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1133.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1161.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1162.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1163.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1250.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1251.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1252.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1253.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1254.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1255.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1256.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1257.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1258.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP273.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP274.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP275.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP277.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP278.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP280.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP281.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP284.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP285.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP290.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP297.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP420.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP423.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP424.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP437.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP500.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP737.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP775.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP850.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP851.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP852.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP853.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP855.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP856.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP857.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP858.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP860.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP861.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP862.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP863.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP864.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP865.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP866.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP868.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP869.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP870.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP871.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP874.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP875.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP880.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP891.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP903.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP904.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP905.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP918.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP922.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP932UDA.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP936EXT.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP942EXT.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP949EXT.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP950.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-AT-DE%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-AT-DE-A%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-CA-FR%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-DK-NO%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-DK-NO-A%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-ES%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-ES-A%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-ES-S%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-FI-SE%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-FI-SE-A%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-FR%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-IT%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-PT%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-UK%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-AT-DE-A.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-AT-DE.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-CA-FR.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-DK-NO-A.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-DK-NO.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-ES-A.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-ES-S.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-ES.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-FI-SE-A.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-FI-SE.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-FR.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-IT.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-PT.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-UK.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/GB12345%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/GB2312%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/GB2312EXT%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/GB2312GBK%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/GB2312UDA1%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/GB2312UDA2%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/GBKEXT%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/GBKUDA%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/ISO-IR-165EXT%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/UCS%25GB12345.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/UCS%25GB2312.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/UCS%25GB2312EXT.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/UCS%25GB2312UDA1.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/UCS%25GB2312UDA2.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/UCS%25GBKEXT.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/UCS%25GBKUDA.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/UCS%25ISO-IR-165EXT.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GEORGIAN/GEORGIAN-ACADEMY%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GEORGIAN/GEORGIAN-PS%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GEORGIAN/UCS%25GEORGIAN-ACADEMY.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GEORGIAN/UCS%25GEORGIAN-PS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-10%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-11%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-13%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-14%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-15%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-16%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-2%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-3%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-4%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-5%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-6%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-7%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-8%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-9%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-10.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-11.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-13.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-14.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-15.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-16.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-2.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-3.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-4.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-5.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-6.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-7.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-8.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-9.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-CA%25UCS.646#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-CA2%25UCS.646#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-CN%25UCS.646#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-CU%25UCS.646#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-DE%25UCS.646#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-DK%25UCS.646#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-ES%25UCS.646#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-ES2%25UCS.646#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-FI%25UCS.646#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-FR%25UCS.646#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-FR1%25UCS.646#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-GB%25UCS.646#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-HU%25UCS.646#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-IT%25UCS.646#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-JP%25UCS.646#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-JP-OCR-B%25UCS.646#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-KR%25UCS.646#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-NO%25UCS.646#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-NO2%25UCS.646#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-PT%25UCS.646#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-PT2%25UCS.646#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-SE%25UCS.646#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-SE2%25UCS.646#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-US%25UCS.646#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-YU%25UCS.646#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/JIS/JISX0201-KANA%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/JIS/JISX0208UDC%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/JIS/JISX0212%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/JIS/JISX0212UDC%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/JIS/UCS%25JISX0201-KANA.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/JIS/UCS%25JISX0208UDC.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/JIS/UCS%25JISX0212.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/JIS/UCS%25JISX0212UDC.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KAZAKH/KZ1048%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KAZAKH/PTCP154%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KAZAKH/UCS%25KZ1048.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KAZAKH/UCS%25PTCP154.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/GOST19768-74%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/ISO-5427%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/KOI7%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/KOI8%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/KOI8-C%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/KOI8-CyrillicOld%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/KOI8-E%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/KOI8-R%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/KOI8-RU%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/KOI8-T%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/KOI8-U%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25GOST19768-74.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25ISO-5427.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25KOI7.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25KOI8-C.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25KOI8-CyrillicOld.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25KOI8-E.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25KOI8-R.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25KOI8-RU.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25KOI8-T.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25KOI8-U.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25KOI8.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KS/JOHAB%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KS/KSC5601HANGUL%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KS/KSC5601HANJA%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KS/UCS%25JOHAB.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KS/UCS%25KSC5601HANGUL.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KS/UCS%25KSC5601HANJA.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/ATARIST%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/DECMCS%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/HP-ROMAN8%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/MULELAO-1%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/NEXTSTEP%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/RISCOS-LATIN1%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/TDS565%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/UCS%25ATARIST.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/UCS%25DECMCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/UCS%25HP-ROMAN8.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/UCS%25MULELAO-1.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/UCS%25NEXTSTEP.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/UCS%25RISCOS-LATIN1.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/UCS%25TDS565.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/TCVN/TCVN5712-1%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/TCVN/UCS%25TCVN5712-1.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/TCVN/UCS%25VISCII.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/TCVN/VISCII%25UCS.src#10 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/ada.4#5 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/cc.4#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/cc_chd.4#3 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/cc_cubic.4#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/cc_hd.4#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/cc_htcp.4#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/cc_newreno.4#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/cc_vegas.4#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/cd.4#4 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/cxgbe.4#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/h_ertt.4#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/iwnfw.4#5 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/md.4#4 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/siftr.4#4 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/siis.4#4 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/u3g.4#9 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/vinum.4#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man5/Makefile#4 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man5/disktab.5#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man5/rc.conf.5#20 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man5/rctl.conf.5#1 branch .. //depot/projects/soc2009/trasz_limits/share/man/man7/release.7#5 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/cc.9#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/hhook.9#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/khelp.9#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/mbuf.9#4 integrate .. //depot/projects/soc2009/trasz_limits/share/mk/bsd.cpu.mk#12 integrate .. //depot/projects/soc2009/trasz_limits/share/mk/bsd.dep.mk#4 integrate .. //depot/projects/soc2009/trasz_limits/share/mk/bsd.lib.mk#9 integrate .. //depot/projects/soc2009/trasz_limits/share/mk/bsd.libnames.mk#11 integrate .. //depot/projects/soc2009/trasz_limits/share/mk/bsd.own.mk#14 integrate .. //depot/projects/soc2009/trasz_limits/share/mk/bsd.prog.mk#6 integrate .. //depot/projects/soc2009/trasz_limits/share/mk/bsd.sys.mk#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/amd64/exception.S#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/amd64/identcpu.c#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/amd64/legacy.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/amd64/machdep.c#31 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/amd64/pmap.c#25 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/amd64/prof_machdep.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/amd64/sys_machdep.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/amd64/trap.c#16 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/ia32/ia32_exception.S#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/include/clock.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/include/cpufunc.h#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/include/pmap.h#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/include/specialreg.h#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/arm/conf/TS7800#1 branch .. //depot/projects/soc2009/trasz_limits/sys/arm/econa/ehci_ebus.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/arm/mv/orion/files.ts7800#1 branch .. //depot/projects/soc2009/trasz_limits/sys/arm/mv/orion/std.ts7800#1 branch .. //depot/projects/soc2009/trasz_limits/sys/arm/xscale/i8134x/crb_machdep.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/boot/fdt/dts/ts7800.dts#1 branch .. //depot/projects/soc2009/trasz_limits/sys/boot/forth/loader.conf#15 integrate .. //depot/projects/soc2009/trasz_limits/sys/boot/i386/gptzfsboot/Makefile#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/boot/i386/zfsboot/Makefile#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/boot/pc98/boot2/boot2.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/cam/ata/ata_all.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/cam/ata/ata_all.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/cam/ata/ata_da.c#16 integrate .. //depot/projects/soc2009/trasz_limits/sys/cam/ata/ata_pmp.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/cam/ata/ata_xpt.c#15 integrate .. //depot/projects/soc2009/trasz_limits/sys/cam/cam_ccb.h#12 integrate .. //depot/projects/soc2009/trasz_limits/sys/cam/cam_periph.c#14 integrate .. //depot/projects/soc2009/trasz_limits/sys/cam/cam_xpt.c#19 integrate .. //depot/projects/soc2009/trasz_limits/sys/cam/scsi/scsi_cd.c#12 integrate .. //depot/projects/soc2009/trasz_limits/sys/cam/scsi/scsi_ch.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/cam/scsi/scsi_da.c#15 integrate .. //depot/projects/soc2009/trasz_limits/sys/cam/scsi/scsi_pass.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/cam/scsi/scsi_pt.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/cam/scsi/scsi_sa.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/cam/scsi/scsi_sg.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/sys/sunddi.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/common/zfs/zfs_ioctl_compat.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/dev/dtrace/amd64/dtrace_subr.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/dev/dtrace/i386/dtrace_subr.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/dev/systrace/systrace.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32_misc.c#19 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32_proto.h#18 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32_syscall.h#16 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32_syscalls.c#16 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32_sysent.c#17 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32_systrace_args.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/syscalls.master#22 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/linprocfs/linprocfs.c#16 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/svr4/imgact_svr4.c#15 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/files#55 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/files.amd64#23 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/files.arm#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/files.i386#25 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/files.ia64#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/files.mips#12 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/files.pc98#14 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/files.powerpc#18 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/files.sparc64#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/files.sun4v#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/kern.mk#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/kern.pre.mk#13 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/kmod.mk#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/options#37 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/altq/altq/altq_subr.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/acpica_prep.sh#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/changes.txt#15 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/common/dmtable.c#12 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/common/dmtbdump.c#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslanalyze.c#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslcompiler.h#13 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslcompiler.y#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/asldefine.h#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslglobal.h#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/asllookup.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslmain.c#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslmap.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslmessages.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslpredef.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/asltypes.h#12 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslutils.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslwalks.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/dtcompile.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/dtcompiler.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/dtexpress.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/dtfield.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/dtio.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/dtparser.l#1 branch .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/dtparser.y#1 branch .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/dtsubtable.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/dttable.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/dttemplate.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/dttemplate.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/dtutils.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/debugger/dbdisply.c#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/dispatcher/dswload.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/dispatcher/dswload2.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/events/evglock.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/events/evmisc.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/events/evregion.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/events/evrgnini.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/events/evxfregn.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/executer/excreate.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/acconfig.h#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/acevents.h#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/acpixf.h#15 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/actypes.h#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/amlcode.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/namespace/nsrepair.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/utilities/utdecode.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/iwn/iwlwifi-1000-128.50.3.1.fw.uu#2 delete .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/iwn/iwlwifi-1000-39.31.5.1.fw.uu#1 branch .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/iwn/iwlwifi-5000-8.24.2.12.fw.uu#2 delete .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/iwn/iwlwifi-5000-8.83.5.1.fw.uu#1 branch .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/iwn/iwlwifi-6000g2a-17.168.5.2.fw.uu#1 branch .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/iwn/iwlwifi-6000g2b-17.168.5.2.fw.uu#1 branch .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/iwn/iwlwifi-6050-41.28.5.1.fw.uu#1 branch .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/iwn/iwlwifi-6050-9.201.4.1.fw.uu#2 delete .. //depot/projects/soc2009/trasz_limits/sys/dev/acpica/acpi.c#22 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/acpica/acpi_cpu.c#14 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/acpica/acpi_thermal.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/acpica/acpi_timer.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ahci/ahci.c#24 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ahci/ahci.h#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/aic7xxx/aicasm/Makefile#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ata/ata-all.c#18 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ata/ata-all.h#12 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ata/ata-lowlevel.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ata/ata-pci.h#15 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ata/chipsets/ata-intel.c#15 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ah.c#13 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ah.h#13 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ah_debug.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ah_decode.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ah_desc.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ah_eeprom_v14.h#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ah_eeprom_v4k.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ah_internal.h#13 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar5212/ar5212_recv.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar5416/ar5416.h#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#17 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar9002/ar9002phy.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar9002/ar9285.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar9002/ar9285_diversity.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar9002/ar9285_diversity.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar9002/ar9285_phy.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar9002/ar9285_phy.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar9002/ar9285_reset.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/if_ath.c#29 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/if_ath_sysctl.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/if_athioctl.h#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/if_athvar.h#12 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/bxe/bxe_debug.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/bxe/bxe_include.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/bxe/if_bxe.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/bxe/if_bxe.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/cas/if_cas.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/cxgbe/adapter.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/cxgbe/common/t4_hw.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/cxgbe/osdep.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/cxgbe/t4_main.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/cxgbe/t4_sge.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/esp/ncr53c9x.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/gem/if_gem.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/hme/if_hme.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/hme/if_hmereg.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ichwd/ichwd.h#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ipmi/ipmi.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/iwn/if_iwn.c#18 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/iwn/if_iwnreg.h#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/iwn/if_iwnvar.h#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mii/brgphyreg.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mii/ciphyreg.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mii/e1000phy.c#13 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mii/e1000phyreg.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mii/mii_physubr.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mii/miivar.h#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mii/rgephyreg.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mii/xmphyreg.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mpt/mpt.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mpt/mpt.h#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mpt/mpt_cam.c#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mpt/mpt_debug.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mpt/mpt_pci.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mvs/mvs.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mvs/mvs.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mwl/if_mwl.c#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mxge/mxge_lro.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ral/rt2560.c#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ral/rt2661.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/siis/siis.c#15 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/siis/siis.h#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/sound/usb/uaudio.c#16 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/sym/README.sym#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/sym/sym_fw1.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/sym/sym_fw2.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/sym/sym_hipd.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/ehci_ixp4xx.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/ehci_mv.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/ehci_pci.c#14 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/storage/umass.c#17 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/fdescfs/fdesc_vnops.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfs/nfs.h#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfs/nfs_commonacl.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfs/nfs_commonkrpc.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfs/nfs_commonport.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfs/nfs_commonsubs.c#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfs/nfs_var.h#16 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfs/nfsport.h#15 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfsclient/nfs.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfsclient/nfs_clbio.c#16 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfsclient/nfs_clnfsiod.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfsclient/nfs_clnode.c#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfsclient/nfs_clport.c#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfsclient/nfs_clrpcops.c#12 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfsclient/nfs_clstate.c#13 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfsclient/nfs_clsubs.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfsclient/nfs_clvfsops.c#13 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfsclient/nfs_clvnops.c#21 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfsclient/nfsnode.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfsserver/nfs_nfsdport.c#20 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfsserver/nfs_nfsdserv.c#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfsserver/nfs_nfsdstate.c#18 integrate .. //depot/projects/soc2009/trasz_limits/sys/geom/eli/g_eli.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/geom/eli/g_eli.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/geom/eli/g_eli_ctl.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/geom/eli/g_eli_integrity.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/geom/eli/g_eli_key.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/geom/eli/g_eli_key_cache.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/geom/eli/g_eli_privacy.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/geom/geom_map.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/geom/part/g_part_apm.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/geom/raid/g_raid.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/bios/apm.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/i386/identcpu.c#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/i386/legacy.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/i386/machdep.c#29 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/i386/perfmon.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/i386/pmap.c#27 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/i386/trap.c#15 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/include/clock.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/include/cpufunc.h#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/include/pmap.h#14 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/include/specialreg.h#12 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/isa/prof_machdep.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/init_sysent.c#18 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_exit.c#35 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_hhook.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_khelp.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#44 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_sig.c#25 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_timeout.c#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/link_elf.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/link_elf_obj.c#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/subr_rman.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/syscalls.c#17 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/syscalls.master#22 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/systrace_args.c#16 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/uipc_sockbuf.c#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/vfs_default.c#12 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/vfs_mount.c#20 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/vfs_syscalls.c#18 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/vnode_if.src#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/atheros/ar71xx_ehci.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/rmi/xls_ehci.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/acpi/acpi/Makefile#17 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/arcnet/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/ath/Makefile#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/bxe/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/cam/Makefile#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/dtrace/dtraceall/Makefile#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/dtrace/systrace_linux32/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/geom/geom_eli/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/iwnfw/Makefile#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/iwnfw/iwn1000/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/iwnfw/iwn5000/Makefile#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/iwnfw/iwn6000g2a/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/sys/modules/iwnfw/iwn6000g2b/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/sys/modules/iwnfw/iwn6050/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/netgraph/atm/ccatm/Makefile#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Apr 26 02:45:52 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DCD531065673; Tue, 26 Apr 2011 02:45: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 9EE461065670 for ; Tue, 26 Apr 2011 02:45:51 +0000 (UTC) (envelope-from lz@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 8B14C8FC17 for ; Tue, 26 Apr 2011 02:45:51 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p3Q2jp0q061449 for ; Tue, 26 Apr 2011 02:45:51 GMT (envelope-from lz@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p3Q2jplp061446 for perforce@freebsd.org; Tue, 26 Apr 2011 02:45:51 GMT (envelope-from lz@FreeBSD.org) Date: Tue, 26 Apr 2011 02:45:51 GMT Message-Id: <201104260245.p3Q2jplp061446@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to lz@FreeBSD.org using -f From: Zheng Liu To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 192115 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Apr 2011 02:45:52 -0000 http://p4web.freebsd.org/@@192115?ac=10 Change 192115 by lz@freebsd-dev on 2011/04/26 02:44:59 Move preallocation's functions to ext2_prealloc.c. Affected files ... .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_alloc.c#44 edit .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_prealloc.c#3 edit Differences ... ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_alloc.c#44 (text+ko) ==== @@ -55,8 +55,6 @@ #define FANCY_REALLOC 1 -#define phy_blk(cg, fs) (((cg) * (fs->e2fs->e2fs_fpg)) + fs->e2fs->e2fs_first_dblock) - static daddr_t ext2_alloccg(struct inode *, int, daddr_t, int); static u_long ext2_dirpref(struct inode *); static void ext2_fserr(struct m_ext2fs *, uid_t, char *); @@ -71,17 +69,6 @@ static daddr_t ext2_clusteralloc(struct inode *, int, daddr_t, int); #endif -/* For reservation window */ -static u_long ext2_alloc_blk(struct inode *, int, struct buf *, int32_t, struct ext2_rsv_win *); -static int ext2_alloc_new_rsv(struct inode *, int, struct buf *, int32_t); -static int ext2_bpref_in_rsv(struct ext2_rsv_win *, int32_t); -static int ext2_find_rsv(struct ext2_rsv_win *, struct ext2_rsv_win *, - struct m_ext2fs *, int32_t, int); -static u_long ext2_rsvalloc(struct m_ext2fs *, struct inode *, - int, struct buf *, int32_t, int); -static daddr_t ext2_search_next_block(struct m_ext2fs *, char *, int, int); -static struct ext2_rsv_win *ext2_search_rsv(struct ext2_rsv_win_tree *, int32_t); - /* * Allocate a block in the file system. * @@ -101,411 +88,6 @@ static int doprealloc = 0; SYSCTL_INT(_vfs_ext2fs, OID_AUTO, doprealloc, CTLFLAG_RW, &doprealloc, 0, ""); -/* - * Allocate a free block. - * - * First check whether reservation window is used. - * If reservation window is used, try to allocate a free - * block from the reservation window. If it fails, traverse - * the bitmap to find a free block. - * If reservation window is not used, try to allocate - * a free block by bpref. If it fails, traverse the bitmap - * to find a free block. - */ -static u_long -ext2_alloc_blk(struct inode *ip, int cg, struct buf *bp, - int32_t bpref, struct ext2_rsv_win *rp) -{ - struct m_ext2fs *fs; - struct ext2mount *ump; - int bno, start, end; - char *bbp; - - fs = ip->i_e2fs; - ump = ip->i_ump; - bbp = (char *)bp->b_data; - - if (fs->e2fs_gd[cg].ext2bgd_nbfree == 0) - return (0); - - if (bpref < 0) - bpref = 0; - - /* Check whether it use reservation window */ - if (rp != NULL) { - /* - * If window's start is not in this cylinder group, - * try to allocate from the beginning, otherwise - * try to allocate from the beginning of the - * window. - */ - if (dtog(fs, rp->rsv_start) < cg) - start = 0; - else - start = rp->rsv_start; - - /* - * If window's end crosses the end of this group, - * set end variable to the end of this group. - * Otherwise, set it to the window's end. - */ - if (dtog(fs, rp->rsv_end) > cg) - end = phy_blk(cg + 1, fs) - 1; - else - end = rp->rsv_end; - - /* If preference block is within the window, try to allocate it. */ - if (start <= bpref && bpref <= end) { - bpref = dtogd(fs, bpref); - if (isclr(bbp, bpref)) { - rp->rsv_alloc_hit++; - bno = bpref; - goto gotit; - } - } else - if (dtog(fs, rp->rsv_start) == cg) - bpref = dtogd(fs, rp->rsv_start); - else - bpref = 0; - } else { - if (dtog(fs, bpref) != cg) - bpref = 0; - if (bpref != 0) { - bpref = dtogd(fs, bpref); - if (isclr(bbp, bpref)) { - bno = bpref; - goto gotit; - } - } - } - - bno = ext2_mapsearch(fs, bbp, bpref); - if (bno < 0) - return (0); - -gotit: - setbit(bbp, (daddr_t)bno); - EXT2_LOCK(ump); - fs->e2fs->e2fs_fbcount--; - fs->e2fs_gd[cg].ext2bgd_nbfree--; - fs->e2fs_fmod = 1; - EXT2_UNLOCK(ump); - bdwrite(bp); - bno = phy_blk(cg, fs) + bno; - return (bno); -} - -/* - * Check bpref is in the reservation window. - */ -static int -ext2_bpref_in_rsv(struct ext2_rsv_win *rp, int32_t bpref) -{ - if (bpref >= 0 && (bpref < rp->rsv_start || bpref > rp->rsv_end)) - return (0); - - return (1); -} - -/* - * Search a tree node from RB tree. It includes the bpref or - * the previous one if bpref is not in any window. - */ -static struct ext2_rsv_win * -ext2_search_rsv(struct ext2_rsv_win_tree *root, int32_t start) -{ - struct ext2_rsv_win *prev, *next; - - if (RB_EMPTY(root)) - return (NULL); - - next = RB_ROOT(root); - do { - prev = next; - if (start < next->rsv_start) - next = RB_LEFT(next, rsv_link); - else if (start > next->rsv_end) - next = RB_RIGHT(next, rsv_link); - else - return (next); - } while (next != NULL); - - if (prev->rsv_start > start) { - next = RB_PREV(ext2_rsv_win_tree, root, prev); - if (next != NULL) - prev = next; - } - - return (prev); -} - -/* - * Find a reservation window by given range from start to - * the end of this cylinder group. - */ -static int -ext2_find_rsv(struct ext2_rsv_win *search, struct ext2_rsv_win *rp, - struct m_ext2fs *fs, int32_t start, int cg) -{ - struct ext2_rsv_win *rsv, *prev; - int32_t cur; - int size = rp->rsv_goal_size; - - if (search == NULL) { - rp->rsv_start = start & ~7; - rp->rsv_end = start + size - 1; - rp->rsv_alloc_hit = 0; - - RB_INSERT(ext2_rsv_win_tree, fs->e2fs_rsv_tree, rp); - - return (0); - } - - /* - * Make the start of reservation window byte-aligned - * in order to can find a free block with bit operations - * in the ext2_search_next_block() function. - */ - cur = start & ~7; - rsv = search; - prev = NULL; - - while (1) { - if (cur <= rsv->rsv_end) - cur = rsv->rsv_end + 1; - - if (dtog(fs, cur) != cg) - return (-1); - - prev = rsv; - rsv = RB_NEXT(ext2_rsv_win_tree, fs->e2fs_rsv_tree, rsv); - - if (rsv == NULL) - break; - - if (cur + size <= rsv->rsv_start) - break; - } - - if (prev != rp && rp->rsv_end != EXT2_RSV_NOT_ALLOCATED) - ext2_remove_rsv_win(fs, rp); - - rp->rsv_start = cur; - rp->rsv_end = cur + size - 1; - rp->rsv_alloc_hit = 0; - - if (prev != rp) - RB_INSERT(ext2_rsv_win_tree, fs->e2fs_rsv_tree, rp); - - return (0); -} - -/* - * Find a free block by given range from bpref to - * the end of this cylinder group. - */ -static daddr_t -ext2_search_next_block(struct m_ext2fs *fs, char *bbp, int bpref, int cg) -{ - daddr_t bno; - int start, loc, len, map, i; - - start = bpref / NBBY; - len = howmany(fs->e2fs->e2fs_fpg, NBBY) - start; - loc = skpc(0xff, len, &bbp[start]); - if (loc == 0) - return (-1); - - i = start + len - loc; - map = bbp[i]; - bno = i * NBBY; - for (i = 1; i < (1 << NBBY); i <<= 1, bno++) { - if ((map & i) == 0) - return (bno); - } - - return (-1); -} - -/* - * Allocate a new reservation window. - */ -static int -ext2_alloc_new_rsv(struct inode *ip, int cg, struct buf *bp, int32_t bpref) -{ - struct m_ext2fs *fs; - struct ext2_rsv_win *rp, *search; - char *bbp; - int start, size, ret; - - fs = ip->i_e2fs; - rp = ip->i_rsv; - bbp = bp->b_data; - size = rp->rsv_goal_size; - - if (bpref <= 0) - start = phy_blk(cg, fs); - else - start = bpref; - - /* Dynamically increase the size of window */ - if (rp->rsv_end != EXT2_RSV_NOT_ALLOCATED) { - if (rp->rsv_alloc_hit > - ((rp->rsv_end - rp->rsv_start + 1) / 2)) { - size = size * 2; - if (size > EXT2_RSV_MAX_RESERVE_BLKS) - size = EXT2_RSV_MAX_RESERVE_BLKS; - rp->rsv_goal_size = size; - } - } - - EXT2_TREE_LOCK(fs); - - search = ext2_search_rsv(fs->e2fs_rsv_tree, start); - -repeat: - ret = ext2_find_rsv(search, rp, fs, start, cg); - if (ret < 0) { - if (rp->rsv_end != EXT2_RSV_NOT_ALLOCATED) - ext2_remove_rsv_win(fs, rp); - EXT2_TREE_UNLOCK(fs); - return (-1); - } - EXT2_TREE_UNLOCK(fs); - - start = dtogd(fs, rp->rsv_start); - start = ext2_search_next_block(fs, bbp, start, cg); - if (start < 0) { - EXT2_TREE_LOCK(fs); - if (rp->rsv_end != EXT2_RSV_NOT_ALLOCATED) - ext2_remove_rsv_win(fs, rp); - EXT2_TREE_UNLOCK(fs); - return (-1); - } - - start = phy_blk(cg, fs) + start; - if (start >= rp->rsv_start && start <= rp->rsv_end) - return (0); - - search = rp; - EXT2_TREE_LOCK(fs); - goto repeat; -} - -/* - * Allocate a free block from reservation window. - */ -static u_long -ext2_rsvalloc(struct m_ext2fs *fs, struct inode *ip, int cg, - struct buf *bp, int32_t bpref, int size) -{ - struct ext2_rsv_win *rp; - int ret; - - rp = ip->i_rsv; - if (rp == NULL) - return (ext2_alloc_blk(ip, cg, bp, bpref, NULL)); - - if (rp->rsv_end == EXT2_RSV_NOT_ALLOCATED || - !ext2_bpref_in_rsv(rp, bpref)) { - ret = ext2_alloc_new_rsv(ip, cg, bp, bpref); - if (ret < 0) - return (0); - } - - return (ext2_alloc_blk(ip, cg, bp, bpref, rp)); -} - -/* - * Allocate a block using reservation window in ext2 file system. - */ -int -ext2_prealloc(struct inode *ip, int32_t lbn, int32_t bpref, - int size, struct ucred *cred) -{ - struct m_ext2fs *fs; - struct ext2mount *ump; - struct buf *bp; - int32_t bno = 0; - int i, cg, error; - - fs = ip->i_e2fs; - ump = ip->i_ump; - mtx_assert(EXT2_MTX(ump), MA_OWNED); - - if (size == fs->e2fs_bsize && fs->e2fs->e2fs_fbcount == 0) - goto fail; - if (cred->cr_uid != 0 && - fs->e2fs->e2fs_fbcount < fs->e2fs->e2fs_rbcount) - goto fail; - - if (bpref >= fs->e2fs->e2fs_bcount) - bpref = 0; - if (bpref == 0) - cg = ino_to_cg(fs, ip->i_number); - else - cg = dtog(fs, bpref); - - /* If cg has some free blocks, then try to allocate a free block from this cg */ - if (fs->e2fs_gd[cg].ext2bgd_nbfree > 0) { - /* Read block bitmap from buffer */ - EXT2_UNLOCK(ump); - error = bread(ip->i_devvp, - fsbtodb(fs, fs->e2fs_gd[cg].ext2bgd_b_bitmap), - (int)fs->e2fs_bsize, NOCRED, &bp); - if (error) { - brelse(bp); - goto fail; - } - - EXT2_RSV_LOCK(ip); - /* Try to allocate from reservation window */ - bno = ext2_rsvalloc(fs, ip, cg, bp, bpref, size); - EXT2_RSV_UNLOCK(ip); - if (bno > 0) - goto allocated; - - brelse(bp); - EXT2_LOCK(ump); - } - - /* Just need to try to allocate a free block from rest groups. */ - cg = (cg + 1) % fs->e2fs_gcount; - for (i = 1; i < fs->e2fs_gcount; i++) { - if (fs->e2fs_gd[cg].ext2bgd_nbfree > 0) { - /* Read block bitmap from buffer */ - EXT2_UNLOCK(ump); - error = bread(ip->i_devvp, - fsbtodb(fs, fs->e2fs_gd[cg].ext2bgd_b_bitmap), - (int)fs->e2fs_bsize, NOCRED, &bp); - if (error) { - brelse(bp); - goto fail; - } - - EXT2_RSV_LOCK(ip); - bno = ext2_rsvalloc(fs, ip, cg, bp, -1, size); - EXT2_RSV_UNLOCK(ip); - if (bno > 0) - goto allocated; - - brelse(bp); - EXT2_LOCK(ump); - } - - cg++; - if (cg == fs->e2fs_gcount) - cg = 0; - } - -allocated: - if (bno > 0) - return (bno); - -fail: - return (0); -} - int ext2_alloc(ip, lbn, bpref, size, cred, bnp) struct inode *ip; @@ -1303,7 +885,7 @@ EXT2_UNLOCK(ump); bdwrite(bp); - return (phy_blk(cg, fs) + bno); + return ((cg * fs->e2fs->e2fs_fpg) + fs->e2fs->e2fs_first_dblock + bno); fail_lock: EXT2_LOCK(ump); @@ -1524,15 +1106,10 @@ start = 0; loc = skpc(0xff, len, &bbp[start]); if (loc == 0) { - /* XXX: just for reservation window */ - if (doprealloc == 1) - return (-1); - else { - printf("start = %d, len = %d, fs = %s\n", - start, len, fs->e2fs_fsmnt); - panic("ext2fs_alloccg: map corrupted"); - /* NOTREACHED */ - } + printf("start = %d, len = %d, fs = %s\n", + start, len, fs->e2fs_fsmnt); + panic("ext2fs_alloccg: map corrupted"); + /* NOTREACHED */ } } i = start + len - loc; ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_prealloc.c#3 (text+ko) ==== @@ -43,12 +43,461 @@ #include #include +static u_long ext2_alloc_blk(struct inode *, int, struct buf *, int32_t, struct ext2_rsv_win *); +static int ext2_alloc_new_rsv(struct inode *, int, struct buf *, int32_t); +static int ext2_bpref_in_rsv(struct ext2_rsv_win *, int32_t); +static int ext2_find_rsv(struct ext2_rsv_win *, struct ext2_rsv_win *, + struct m_ext2fs *, int32_t, int); +static daddr_t ext2_mapsearch(struct m_ext2fs *, char *, daddr_t); +static u_long ext2_rsvalloc(struct m_ext2fs *, struct inode *, + int, struct buf *, int32_t, int); +static daddr_t ext2_search_next_block(struct m_ext2fs *, char *, int, int); +static struct ext2_rsv_win *ext2_search_rsv(struct ext2_rsv_win_tree *, int32_t); + RB_GENERATE(ext2_rsv_win_tree, ext2_rsv_win, rsv_link, ext2_rsv_win_cmp); static int prealloc_size = 8; SYSCTL_UINT(_vfs_ext2fs, OID_AUTO, prealloc_size, CTLFLAG_RW, &prealloc_size, 0, ""); /* + * Allocate a free block. + * + * First check whether reservation window is used. + * If reservation window is used, try to allocate a free + * block from the reservation window. If it fails, traverse + * the bitmap to find a free block. + * If reservation window is not used, try to allocate + * a free block by bpref. If it fails, traverse the bitmap + * to find a free block. + */ +static u_long +ext2_alloc_blk(struct inode *ip, int cg, struct buf *bp, + int32_t bpref, struct ext2_rsv_win *rp) +{ + struct m_ext2fs *fs; + struct ext2mount *ump; + int bno, start, end; + char *bbp; + + fs = ip->i_e2fs; + ump = ip->i_ump; + bbp = (char *)bp->b_data; + + if (fs->e2fs_gd[cg].ext2bgd_nbfree == 0) + return (0); + + if (bpref < 0) + bpref = 0; + + /* Check whether it use reservation window */ + if (rp != NULL) { + /* + * If window's start is not in this cylinder group, + * try to allocate from the beginning, otherwise + * try to allocate from the beginning of the + * window. + */ + if (dtog(fs, rp->rsv_start) < cg) + start = 0; + else + start = rp->rsv_start; + + /* + * If window's end crosses the end of this group, + * set end variable to the end of this group. + * Otherwise, set it to the window's end. + */ + if (dtog(fs, rp->rsv_end) > cg) + end = cg * fs->e2fs->e2fs_fpg + fs->e2fs->e2fs_first_dblock - 1; + else + end = rp->rsv_end; + + /* If preference block is within the window, try to allocate it. */ + if (start <= bpref && bpref <= end) { + bpref = dtogd(fs, bpref); + if (isclr(bbp, bpref)) { + rp->rsv_alloc_hit++; + bno = bpref; + goto gotit; + } + } else + if (dtog(fs, rp->rsv_start) == cg) + bpref = dtogd(fs, rp->rsv_start); + else + bpref = 0; + } else { + if (dtog(fs, bpref) != cg) + bpref = 0; + if (bpref != 0) { + bpref = dtogd(fs, bpref); + if (isclr(bbp, bpref)) { + bno = bpref; + goto gotit; + } + } + } + + bno = ext2_mapsearch(fs, bbp, bpref); + if (bno < 0) + return (0); + +gotit: + setbit(bbp, (daddr_t)bno); + EXT2_LOCK(ump); + fs->e2fs->e2fs_fbcount--; + fs->e2fs_gd[cg].ext2bgd_nbfree--; + fs->e2fs_fmod = 1; + EXT2_UNLOCK(ump); + bdwrite(bp); + return (cg * fs->e2fs->e2fs_fpg + fs->e2fs->e2fs_first_dblock + bno); +} + +/* + * Check bpref is in the reservation window. + */ +static int +ext2_bpref_in_rsv(struct ext2_rsv_win *rp, int32_t bpref) +{ + if (bpref >= 0 && (bpref < rp->rsv_start || bpref > rp->rsv_end)) + return (0); + + return (1); +} + +/* + * Search a tree node from RB tree. It includes the bpref or + * the previous one if bpref is not in any window. + */ +static struct ext2_rsv_win * +ext2_search_rsv(struct ext2_rsv_win_tree *root, int32_t start) +{ + struct ext2_rsv_win *prev, *next; + + if (RB_EMPTY(root)) + return (NULL); + + next = RB_ROOT(root); + do { + prev = next; + if (start < next->rsv_start) + next = RB_LEFT(next, rsv_link); + else if (start > next->rsv_end) + next = RB_RIGHT(next, rsv_link); + else + return (next); + } while (next != NULL); + + if (prev->rsv_start > start) { + next = RB_PREV(ext2_rsv_win_tree, root, prev); + if (next != NULL) + prev = next; + } + + return (prev); +} + +/* + * Find a reservation window by given range from start to + * the end of this cylinder group. + */ +static int +ext2_find_rsv(struct ext2_rsv_win *search, struct ext2_rsv_win *rp, + struct m_ext2fs *fs, int32_t start, int cg) +{ + struct ext2_rsv_win *rsv, *prev; + int32_t cur; + int size = rp->rsv_goal_size; + + if (search == NULL) { + rp->rsv_start = start & ~7; + rp->rsv_end = start + size - 1; + rp->rsv_alloc_hit = 0; + + RB_INSERT(ext2_rsv_win_tree, fs->e2fs_rsv_tree, rp); + + return (0); + } + + /* + * Make the start of reservation window byte-aligned + * in order to can find a free block with bit operations + * in the ext2_search_next_block() function. + */ + cur = start & ~7; + rsv = search; + prev = NULL; + + while (1) { + if (cur <= rsv->rsv_end) + cur = rsv->rsv_end + 1; + + if (dtog(fs, cur) != cg) + return (-1); + + prev = rsv; + rsv = RB_NEXT(ext2_rsv_win_tree, fs->e2fs_rsv_tree, rsv); + + if (rsv == NULL) + break; + + if (cur + size <= rsv->rsv_start) + break; + } + + if (prev != rp && rp->rsv_end != EXT2_RSV_NOT_ALLOCATED) + ext2_remove_rsv_win(fs, rp); + + rp->rsv_start = cur; + rp->rsv_end = cur + size - 1; + rp->rsv_alloc_hit = 0; + + if (prev != rp) + RB_INSERT(ext2_rsv_win_tree, fs->e2fs_rsv_tree, rp); + + return (0); +} + +/* + * Find a free block by given range from bpref to + * the end of this cylinder group. + */ +static daddr_t +ext2_search_next_block(struct m_ext2fs *fs, char *bbp, int bpref, int cg) +{ + daddr_t bno; + int start, loc, len, map, i; + + start = bpref / NBBY; + len = howmany(fs->e2fs->e2fs_fpg, NBBY) - start; + loc = skpc(0xff, len, &bbp[start]); + if (loc == 0) + return (-1); + + i = start + len - loc; + map = bbp[i]; + bno = i * NBBY; + for (i = 1; i < (1 << NBBY); i <<= 1, bno++) { + if ((map & i) == 0) + return (bno); + } + + return (-1); +} + +/* + * Allocate a new reservation window. + */ +static int +ext2_alloc_new_rsv(struct inode *ip, int cg, struct buf *bp, int32_t bpref) +{ + struct m_ext2fs *fs; + struct ext2_rsv_win *rp, *search; + char *bbp; + int start, size, ret; + + fs = ip->i_e2fs; + rp = ip->i_rsv; + bbp = bp->b_data; + size = rp->rsv_goal_size; + + if (bpref <= 0) + start = cg * fs->e2fs->e2fs_fpg + fs->e2fs->e2fs_first_dblock; + else + start = bpref; + + /* Dynamically increase the size of window */ + if (rp->rsv_end != EXT2_RSV_NOT_ALLOCATED) { + if (rp->rsv_alloc_hit > + ((rp->rsv_end - rp->rsv_start + 1) / 2)) { + size = size * 2; + if (size > EXT2_RSV_MAX_RESERVE_BLKS) + size = EXT2_RSV_MAX_RESERVE_BLKS; + rp->rsv_goal_size = size; + } + } + + EXT2_TREE_LOCK(fs); + + search = ext2_search_rsv(fs->e2fs_rsv_tree, start); + +repeat: + ret = ext2_find_rsv(search, rp, fs, start, cg); + if (ret < 0) { + if (rp->rsv_end != EXT2_RSV_NOT_ALLOCATED) + ext2_remove_rsv_win(fs, rp); + EXT2_TREE_UNLOCK(fs); + return (-1); + } + EXT2_TREE_UNLOCK(fs); + + start = dtogd(fs, rp->rsv_start); + start = ext2_search_next_block(fs, bbp, start, cg); + if (start < 0) { + EXT2_TREE_LOCK(fs); + if (rp->rsv_end != EXT2_RSV_NOT_ALLOCATED) + ext2_remove_rsv_win(fs, rp); + EXT2_TREE_UNLOCK(fs); + return (-1); + } + + start = cg * fs->e2fs->e2fs_fpg + fs->e2fs->e2fs_first_dblock + start; + if (start >= rp->rsv_start && start <= rp->rsv_end) + return (0); + + search = rp; + EXT2_TREE_LOCK(fs); + goto repeat; +} + +/* + * Allocate a free block from reservation window. + */ +static u_long +ext2_rsvalloc(struct m_ext2fs *fs, struct inode *ip, int cg, + struct buf *bp, int32_t bpref, int size) +{ + struct ext2_rsv_win *rp; + int ret; + + rp = ip->i_rsv; + if (rp == NULL) + return (ext2_alloc_blk(ip, cg, bp, bpref, NULL)); + + if (rp->rsv_end == EXT2_RSV_NOT_ALLOCATED || + !ext2_bpref_in_rsv(rp, bpref)) { + ret = ext2_alloc_new_rsv(ip, cg, bp, bpref); + if (ret < 0) + return (0); + } + + return (ext2_alloc_blk(ip, cg, bp, bpref, rp)); +} + +/* + * Allocate a block using reservation window in ext2 file system. + */ +int +ext2_prealloc(struct inode *ip, int32_t lbn, int32_t bpref, + int size, struct ucred *cred) +{ + struct m_ext2fs *fs; + struct ext2mount *ump; + struct buf *bp; + int32_t bno = 0; + int i, cg, error; + + fs = ip->i_e2fs; + ump = ip->i_ump; + mtx_assert(EXT2_MTX(ump), MA_OWNED); + + if (size == fs->e2fs_bsize && fs->e2fs->e2fs_fbcount == 0) + goto fail; + if (cred->cr_uid != 0 && + fs->e2fs->e2fs_fbcount < fs->e2fs->e2fs_rbcount) + goto fail; + + if (bpref >= fs->e2fs->e2fs_bcount) + bpref = 0; + if (bpref == 0) + cg = ino_to_cg(fs, ip->i_number); + else + cg = dtog(fs, bpref); + + /* If cg has some free blocks, then try to allocate a free block from this cg */ + if (fs->e2fs_gd[cg].ext2bgd_nbfree > 0) { + /* Read block bitmap from buffer */ + EXT2_UNLOCK(ump); + error = bread(ip->i_devvp, + fsbtodb(fs, fs->e2fs_gd[cg].ext2bgd_b_bitmap), + (int)fs->e2fs_bsize, NOCRED, &bp); + if (error) { + brelse(bp); + goto fail; + } + + EXT2_RSV_LOCK(ip); + /* Try to allocate from reservation window */ + bno = ext2_rsvalloc(fs, ip, cg, bp, bpref, size); + EXT2_RSV_UNLOCK(ip); + if (bno > 0) + goto allocated; + + brelse(bp); + EXT2_LOCK(ump); + } + + /* Just need to try to allocate a free block from rest groups. */ + cg = (cg + 1) % fs->e2fs_gcount; + for (i = 1; i < fs->e2fs_gcount; i++) { + if (fs->e2fs_gd[cg].ext2bgd_nbfree > 0) { + /* Read block bitmap from buffer */ + EXT2_UNLOCK(ump); + error = bread(ip->i_devvp, + fsbtodb(fs, fs->e2fs_gd[cg].ext2bgd_b_bitmap), + (int)fs->e2fs_bsize, NOCRED, &bp); + if (error) { + brelse(bp); + goto fail; + } + + EXT2_RSV_LOCK(ip); + bno = ext2_rsvalloc(fs, ip, cg, bp, -1, size); + EXT2_RSV_UNLOCK(ip); + if (bno > 0) + goto allocated; + + brelse(bp); + EXT2_LOCK(ump); + } + + cg++; + if (cg == fs->e2fs_gcount) + cg = 0; + } + +allocated: + if (bno > 0) + return (bno); + +fail: + return (0); +} + +/* + * Find a block in the specified cylinder group. + */ +static daddr_t +ext2_mapsearch(struct m_ext2fs *fs, char *bbp, daddr_t bpref) +{ + int start, len, loc, i, map; + + /* + * find the fragment by searching through the free block + * map for an appropriate bit pattern + */ + if (bpref) + start = dtogd(fs, bpref) / NBBY; + else + start = 0; + len = howmany(fs->e2fs->e2fs_fpg, NBBY) - start; + loc = skpc(0xff, len, &bbp[start]); + if (loc == 0) { + len = start + 1; + start = 0; + loc = skpc(0xff, len, &bbp[start]); + if (loc == 0) + return (-1); + } + i = start + len - loc; + map = bbp[i] ^ 0xff; + if (map == 0) { + printf("fs = %s\n", fs->e2fs_fsmnt); + panic("ext2fs_mapsearch: block not in map"); + } + return (i * NBBY + ffs(map) - 1); +} + +/* * Remove a ext2_rsv_win structure from RB tree. */ void From owner-p4-projects@FreeBSD.ORG Tue Apr 26 11:14:54 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 524BF1065672; Tue, 26 Apr 2011 11:14: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 151C5106566C for ; Tue, 26 Apr 2011 11:14:54 +0000 (UTC) (envelope-from lz@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id DF0DC8FC16 for ; Tue, 26 Apr 2011 11:14:53 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p3QBEr3x063684 for ; Tue, 26 Apr 2011 11:14:53 GMT (envelope-from lz@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p3QBErBH063681 for perforce@freebsd.org; Tue, 26 Apr 2011 11:14:53 GMT (envelope-from lz@FreeBSD.org) Date: Tue, 26 Apr 2011 11:14:53 GMT Message-Id: <201104261114.p3QBErBH063681@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to lz@FreeBSD.org using -f From: Zheng Liu To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 192128 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Apr 2011 11:14:54 -0000 http://p4web.freebsd.org/@@192128?ac=10 Change 192128 by lz@freebsd-dev on 2011/04/26 11:14:18 Copy ext4_hash.[ch] files from ext4fs to ext2fs and rename them. Affected files ... .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_hash.c#1 add .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_hash.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue Apr 26 11:19:18 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3ED7B1065672; Tue, 26 Apr 2011 11:19: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 01CF5106564A for ; Tue, 26 Apr 2011 11:19:18 +0000 (UTC) (envelope-from lz@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id CB7A58FC13 for ; Tue, 26 Apr 2011 11:19:17 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p3QBJH4u063864 for ; Tue, 26 Apr 2011 11:19:17 GMT (envelope-from lz@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p3QBJHkh063861 for perforce@freebsd.org; Tue, 26 Apr 2011 11:19:17 GMT (envelope-from lz@FreeBSD.org) Date: Tue, 26 Apr 2011 11:19:17 GMT Message-Id: <201104261119.p3QBJHkh063861@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to lz@FreeBSD.org using -f From: Zheng Liu To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 192129 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Apr 2011 11:19:18 -0000 http://p4web.freebsd.org/@@192129?ac=10 Change 192129 by lz@freebsd-dev on 2011/04/26 11:18:35 Rename some varibles and add ext2_hash.c into Makefile. Affected files ... .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_hash.c#2 edit .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_hash.h#2 edit .. //depot/projects/soc2010/extfs/src/sys/modules/ext2fs/Makefile#3 edit Differences ... ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_hash.c#2 (text+ko) ==== @@ -13,7 +13,7 @@ #include #include -#include +#include /* * Constants for MD4Transform routine. @@ -110,7 +110,7 @@ * Tiny Encryption Algorithm. */ void -TEA_transform(u_int32_t buf[4], u_int32_t in[8]) +tea_transform(u_int32_t buf[4], u_int32_t in[8]) { u_int32_t sum; u_int32_t x, y; @@ -182,7 +182,7 @@ /* * Refer Haiku's implementation. This implemention is MIT license. - * So the kernel can not be contaminated. + * So the kernel can not be contaminated by GPL. */ void str2hashbuf_unsigned(const char *str, int len, u_int32_t *buf, int num) ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_hash.h#2 (text+ko) ==== @@ -7,15 +7,15 @@ * Zheng Liu */ -#ifndef _FS_EXT4FS_EXT4_HASH_H_ -#define _FS_EXT4FS_EXT4_HASH_H_ +#ifndef _FS_EXT2FS_EXT2_HASH_H_ +#define _FS_EXT2FS_EXT2_HASH_H_ -/* ext4_hash.c */ -u_int32_t half_md4_transform(u_int32_t [], u_int32_t []); -void TEA_transform(u_int32_t [], u_int32_t []); -void str2hashbuf_signed(const char *, int, u_int32_t *, int); -void str2hashbuf_unsigned(const char *, int, u_int32_t *, int); -u_int32_t legacy_hash_signed(const char *, int); -u_int32_t legacy_hash_unsigned(const char *, int); +/* ext2_hash.c */ +u_int32_t half_md4_transform(u_int32_t [], u_int32_t []); +void tea_transform(u_int32_t [], u_int32_t []); +void str2hashbuf_signed(const char *, int, u_int32_t *, int); +void str2hashbuf_unsigned(const char *, int, u_int32_t *, int); +u_int32_t legacy_hash_signed(const char *, int); +u_int32_t legacy_hash_unsigned(const char *, int); -#endif /* !_FS_EXT4FS_EXT4_HASH_H_ */ +#endif /* !_FS_EXT2FS_EXT2_HASH_H_ */ ==== //depot/projects/soc2010/extfs/src/sys/modules/ext2fs/Makefile#3 (text+ko) ==== @@ -3,8 +3,8 @@ .PATH: ${.CURDIR}/../../fs/ext2fs KMOD= ext2fs SRCS= opt_ddb.h opt_quota.h opt_suiddir.h vnode_if.h \ - ext2_alloc.c ext2_balloc.c ext2_bmap.c ext2_inode.c \ - ext2_inode_cnv.c ext2_lookup.c ext2_prealloc.c \ - ext2_subr.c ext2_vfsops.c ext2_vnops.c + ext2_alloc.c ext2_balloc.c ext2_bmap.c ext2_hash.c \ + ext2_inode.c ext2_inode_cnv.c ext2_lookup.c \ + ext2_prealloc.c ext2_subr.c ext2_vfsops.c ext2_vnops.c .include From owner-p4-projects@FreeBSD.ORG Tue Apr 26 13:41:48 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A82A81065674; Tue, 26 Apr 2011 13:41: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 6ABBB1065672 for ; Tue, 26 Apr 2011 13:41:48 +0000 (UTC) (envelope-from lz@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 58DA98FC1D for ; Tue, 26 Apr 2011 13:41:48 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p3QDfmlN092895 for ; Tue, 26 Apr 2011 13:41:48 GMT (envelope-from lz@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p3QDfmHr092892 for perforce@freebsd.org; Tue, 26 Apr 2011 13:41:48 GMT (envelope-from lz@FreeBSD.org) Date: Tue, 26 Apr 2011 13:41:48 GMT Message-Id: <201104261341.p3QDfmHr092892@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to lz@FreeBSD.org using -f From: Zheng Liu To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 192137 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Apr 2011 13:41:48 -0000 http://p4web.freebsd.org/@@192137?ac=10 Change 192137 by lz@freebsd-dev on 2011/04/26 13:41:27 Rename two files like ffs. Affected files ... .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_alloc.c#45 edit .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_balloc.c#9 edit .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_hash.c#3 edit .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_hash.h#3 move/delete .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_inode.c#8 edit .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_prealloc.c#4 edit .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_prealloc.h#4 move/delete .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_vfsops.c#15 edit .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/hash.h#1 move/add .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/prealloc.h#1 move/add Moved files ... .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/hash.h#1 moved from //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_hash.h#2 .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/prealloc.h#1 moved from //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_prealloc.h#3 Differences ... ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_alloc.c#45 (text+ko) ==== @@ -51,7 +51,7 @@ #include #include #include -#include +#include #define FANCY_REALLOC 1 ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_balloc.c#9 (text+ko) ==== @@ -49,7 +49,7 @@ #include #include #include -#include +#include /* * Balloc defines the structure of file system storage ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_hash.c#3 (text+ko) ==== @@ -13,7 +13,7 @@ #include #include -#include +#include /* * Constants for MD4Transform routine. ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_inode.c#8 (text+ko) ==== @@ -52,7 +52,7 @@ #include #include #include -#include +#include static int ext2_indirtrunc(struct inode *, int32_t, int32_t, int32_t, int, long *); ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_prealloc.c#4 (text+ko) ==== @@ -41,7 +41,7 @@ #include #include #include -#include +#include static u_long ext2_alloc_blk(struct inode *, int, struct buf *, int32_t, struct ext2_rsv_win *); static int ext2_alloc_new_rsv(struct inode *, int, struct buf *, int32_t); ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_vfsops.c#15 (text+ko) ==== @@ -62,7 +62,7 @@ #include #include #include -#include +#include static int ext2_flushfiles(struct mount *mp, int flags, struct thread *td); static int ext2_mountfs(struct vnode *, struct mount *); ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/hash.h#1 (text+ko) ==== @@ -7,8 +7,8 @@ * Zheng Liu */ -#ifndef _FS_EXT2FS_EXT2_HASH_H_ -#define _FS_EXT2FS_EXT2_HASH_H_ +#ifndef _FS_EXT2FS_HASH_H_ +#define _FS_EXT2FS_HASH_H_ /* ext2_hash.c */ u_int32_t half_md4_transform(u_int32_t [], u_int32_t []); @@ -18,4 +18,4 @@ u_int32_t legacy_hash_signed(const char *, int); u_int32_t legacy_hash_unsigned(const char *, int); -#endif /* !_FS_EXT2FS_EXT2_HASH_H_ */ +#endif /* !_FS_EXT2FS_HASH_H_ */ ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/prealloc.h#1 (text+ko) ==== @@ -23,10 +23,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/ext2fs/ext2_prealloc.h,v 0.1 2011/03/27 13:37:00 lz Exp $ + * $FreeBSD: src/sys/fs/ext2fs/prealloc.h,v 0.1 2011/03/27 13:37:00 lz Exp $ */ -#ifndef _FS_EXT2FS_EXT2_PREALLOC_H_ -#define _FS_EXT2FS_EXT2_PREALLOC_H_ +#ifndef _FS_EXT2FS_PREALLOC_H_ +#define _FS_EXT2FS_PREALLOC_H_ #include @@ -76,4 +76,4 @@ int ext2_prealloc(struct inode *, int32_t, int32_t, int, struct ucred *); void ext2_remove_rsv_win(struct m_ext2fs *, struct ext2_rsv_win *); -#endif /* !_FS_EXT2FS_EXT2_PREALLOC_H_ */ +#endif /* !_FS_EXT2FS_PREALLOC_H_ */ From owner-p4-projects@FreeBSD.ORG Wed Apr 27 14:22:54 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EE92B106566C; Wed, 27 Apr 2011 14:22: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 A49BC106564A for ; Wed, 27 Apr 2011 14:22:53 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 781B28FC12 for ; Wed, 27 Apr 2011 14:22:53 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p3REMr4x088764 for ; Wed, 27 Apr 2011 14:22:53 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p3REMrma088761 for perforce@freebsd.org; Wed, 27 Apr 2011 14:22:53 GMT (envelope-from jhb@freebsd.org) Date: Wed, 27 Apr 2011 14:22:53 GMT Message-Id: <201104271422.p3REMrma088761@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 192189 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Apr 2011 14:22:54 -0000 http://p4web.freebsd.org/@@192189?ac=10 Change 192189 by jhb@jhb_jhbbsd on 2011/04/27 14:21:57 Fix build on i386. Affected files ... .. //depot/projects/mcelog/mcelog.c#7 edit Differences ... ==== //depot/projects/mcelog/mcelog.c#7 (text) ==== @@ -29,6 +29,10 @@ #include #include #include +#ifdef __i386__ +/* Conflicts with 'enum cputype' in . */ +#undef CPU_P4 +#endif #include #include #include From owner-p4-projects@FreeBSD.ORG Wed Apr 27 17:45:54 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3B3811065670; Wed, 27 Apr 2011 17:45: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 F224E106564A for ; Wed, 27 Apr 2011 17:45:53 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id C84DD8FC0A for ; Wed, 27 Apr 2011 17:45:53 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p3RHjr8T029453 for ; Wed, 27 Apr 2011 17:45:53 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p3RHjrfq029450 for perforce@freebsd.org; Wed, 27 Apr 2011 17:45:53 GMT (envelope-from jhb@freebsd.org) Date: Wed, 27 Apr 2011 17:45:53 GMT Message-Id: <201104271745.p3RHjrfq029450@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 192198 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Apr 2011 17:45:54 -0000 http://p4web.freebsd.org/@@192198?ac=10 Change 192198 by jhb@jhb_jhbbsd on 2011/04/27 17:45:29 - If we fail to allocate the initial window, disable the window. - Make sure we don't pass RF_ACTIVE up to the PCI bus when allocating the initial resource when growing a window. - Enable memory or I/O decoding when first activating a window. Affected files ... .. //depot/projects/pci/sys/dev/pci/pci_pci.c#15 edit Differences ... ==== //depot/projects/pci/sys/dev/pci/pci_pci.c#15 (text+ko) ==== @@ -60,6 +60,7 @@ static int pcib_resume(device_t dev); static int pcib_power_for_sleep(device_t pcib, device_t dev, int *pstate); +static void pcib_write_windows(struct pcib_softc *sc, int mask); static device_method_t pcib_methods[] = { /* Device interface */ @@ -146,7 +147,20 @@ return (pw->valid && pw->base < pw->limit); } +/* + * XXX: If RF_ACTIVE did not also imply allocating a bus space tag and + * handle for the resource, we could pass RF_ACTIVE up to the PCI bus + * when allocating the resource windows and rely on the PCI bus driver + * to do this for us. + */ static void +pcib_activate_window(struct pcib_softc *sc, int type) +{ + + PCI_ENABLE_IO(device_get_parent(sc->dev), sc->dev, type); +} + +static void pcib_alloc_window(struct pcib_softc *sc, struct pcib_window *w, int type, int flags, pci_addr_t max_address) { @@ -181,8 +195,12 @@ device_printf(sc->dev, "failed to allocate initial %s window: %#jx-%#jx\n", w->name, (uintmax_t)w->base, (uintmax_t)w->limit); + w->base = max_address; + w->limit = 0; + pcib_write_windows(sc, w->mask); return; } + pcib_activate_window(sc, type); error = rman_manage_region(&w->rman, rman_get_start(w->res), rman_get_end(w->res)); @@ -859,7 +877,7 @@ count = roundup2(count, 1ul << w->step); rid = w->reg; w->res = bus_alloc_resource(sc->dev, type, &rid, start, end, - count, flags); + count, flags & ~RF_ACTIVE); if (w->res == NULL) { if (bootverbose) device_printf(sc->dev, @@ -883,6 +901,7 @@ w->res = NULL; return (error); } + pcib_activate_window(sc, type); goto updatewin; } From owner-p4-projects@FreeBSD.ORG Wed Apr 27 17:48:06 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 27F0C1065670; Wed, 27 Apr 2011 17: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 C66BF106566B for ; Wed, 27 Apr 2011 17:48:05 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id AEA618FC18 for ; Wed, 27 Apr 2011 17:48:05 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p3RHm59v029541 for ; Wed, 27 Apr 2011 17:48:05 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p3RHm5Ln029538 for perforce@freebsd.org; Wed, 27 Apr 2011 17:48:05 GMT (envelope-from jhb@freebsd.org) Date: Wed, 27 Apr 2011 17:48:05 GMT Message-Id: <201104271748.p3RHm5Ln029538@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 192199 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Apr 2011 17:48:06 -0000 http://p4web.freebsd.org/@@192199?ac=10 Change 192199 by jhb@jhb_jhbbsd on 2011/04/27 17:47:25 Tidy. Affected files ... .. //depot/projects/pci/sys/dev/pci/pci_pci.c#16 edit Differences ... ==== //depot/projects/pci/sys/dev/pci/pci_pci.c#16 (text+ko) ==== @@ -60,7 +60,6 @@ static int pcib_resume(device_t dev); static int pcib_power_for_sleep(device_t pcib, device_t dev, int *pstate); -static void pcib_write_windows(struct pcib_softc *sc, int mask); static device_method_t pcib_methods[] = { /* Device interface */ @@ -161,6 +160,43 @@ } static void +pcib_write_windows(struct pcib_softc *sc, int mask) +{ + device_t dev; + uint32_t val; + + dev = sc->dev; + if (sc->io.valid && mask & WIN_IO) { + val = pci_read_config(dev, PCIR_IOBASEL_1, 1); + if ((val & PCIM_BRIO_MASK) == PCIM_BRIO_32) { + pci_write_config(dev, PCIR_IOBASEH_1, + sc->io.base >> 16, 2); + pci_write_config(dev, PCIR_IOLIMITH_1, + sc->io.limit >> 16, 2); + } + pci_write_config(dev, PCIR_IOBASEL_1, sc->io.base >> 8, 1); + pci_write_config(dev, PCIR_IOLIMITL_1, sc->io.limit >> 8, 1); + } + + if (mask & WIN_MEM) { + pci_write_config(dev, PCIR_MEMBASE_1, sc->mem.base >> 16, 2); + pci_write_config(dev, PCIR_MEMLIMIT_1, sc->mem.limit >> 16, 2); + } + + if (sc->pmem.valid && mask & WIN_PMEM) { + val = pci_read_config(dev, PCIR_PMBASEL_1, 2); + if ((val & PCIM_BRPM_MASK) == PCIM_BRPM_64) { + pci_write_config(dev, PCIR_PMBASEH_1, + sc->pmem.base >> 32, 4); + pci_write_config(dev, PCIR_PMLIMITH_1, + sc->pmem.limit >> 32, 4); + } + pci_write_config(dev, PCIR_PMBASEL_1, sc->pmem.base >> 16, 2); + pci_write_config(dev, PCIR_PMLIMITL_1, sc->pmem.limit >> 16, 2); + } +} + +static void pcib_alloc_window(struct pcib_softc *sc, struct pcib_window *w, int type, int flags, pci_addr_t max_address) { @@ -322,43 +358,6 @@ } } -static void -pcib_write_windows(struct pcib_softc *sc, int mask) -{ - device_t dev; - uint32_t val; - - dev = sc->dev; - if (sc->io.valid && mask & WIN_IO) { - val = pci_read_config(dev, PCIR_IOBASEL_1, 1); - if ((val & PCIM_BRIO_MASK) == PCIM_BRIO_32) { - pci_write_config(dev, PCIR_IOBASEH_1, - sc->io.base >> 16, 2); - pci_write_config(dev, PCIR_IOLIMITH_1, - sc->io.limit >> 16, 2); - } - pci_write_config(dev, PCIR_IOBASEL_1, sc->io.base >> 8, 1); - pci_write_config(dev, PCIR_IOLIMITL_1, sc->io.limit >> 8, 1); - } - - if (mask & WIN_MEM) { - pci_write_config(dev, PCIR_MEMBASE_1, sc->mem.base >> 16, 2); - pci_write_config(dev, PCIR_MEMLIMIT_1, sc->mem.limit >> 16, 2); - } - - if (sc->pmem.valid && mask & WIN_PMEM) { - val = pci_read_config(dev, PCIR_PMBASEL_1, 2); - if ((val & PCIM_BRPM_MASK) == PCIM_BRPM_64) { - pci_write_config(dev, PCIR_PMBASEH_1, - sc->pmem.base >> 32, 4); - pci_write_config(dev, PCIR_PMLIMITH_1, - sc->pmem.limit >> 32, 4); - } - pci_write_config(dev, PCIR_PMBASEL_1, sc->pmem.base >> 16, 2); - pci_write_config(dev, PCIR_PMLIMITL_1, sc->pmem.limit >> 16, 2); - } -} - #else /* From owner-p4-projects@FreeBSD.ORG Wed Apr 27 17:49:12 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 21CF1106567A; Wed, 27 Apr 2011 17:49: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 D7F3A1065676 for ; Wed, 27 Apr 2011 17:49:11 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id C4CAF8FC17 for ; Wed, 27 Apr 2011 17:49:11 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p3RHnBrt029599 for ; Wed, 27 Apr 2011 17:49:11 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p3RHnBtB029596 for perforce@freebsd.org; Wed, 27 Apr 2011 17:49:11 GMT (envelope-from jhb@freebsd.org) Date: Wed, 27 Apr 2011 17:49:11 GMT Message-Id: <201104271749.p3RHnBtB029596@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 192200 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Apr 2011 17:49:12 -0000 http://p4web.freebsd.org/@@192200?ac=10 Change 192200 by jhb@jhb_jhbbsd on 2011/04/27 17:48:46 Honor acpi_host_mem_start when allocating I/O windows for PCI-PCI bridges. I think we might want to honor host_mem_start for any allocation that isn't fixed (i.e. where start + count - 1 == end). Affected files ... .. //depot/projects/pci/sys/dev/acpica/acpi_pcib_acpi.c#8 edit Differences ... ==== //depot/projects/pci/sys/dev/acpica/acpi_pcib_acpi.c#8 (text+ko) ==== @@ -551,10 +551,16 @@ * found to do it. This is typically only used on older laptops * that don't have pci busses behind pci bridge, so assuming > 32MB * is likely OK. + * + * PCI-PCI bridges may not allocate smaller ranges for their windows, + * but the heuristics here should apply to those, so we allow several + * different end addresses. */ - if (type == SYS_RES_MEMORY && start == 0UL && end == ~0UL) + if (type == SYS_RES_MEMORY && start == 0UL && (end == ~0UL || + end == 0xffffffff)) start = acpi_host_mem_start; - if (type == SYS_RES_IOPORT && start == 0UL && end == ~0UL) + if (type == SYS_RES_IOPORT && start == 0UL && (end == ~0UL || + end == 0xffff || end == 0xffffffff)) start = 0x1000; return (bus_generic_alloc_resource(dev, child, type, rid, start, end, count, flags));