PERFORCE change 133010 for review

John Birrell jb at FreeBSD.org
Thu Jan 10 19:03:30 PST 2008 

http://perforce.freebsd.org/chv.cgi?CH=133010

Change 133010 by jb at jb_freebsd1 on 2008/01/11 03:02:55

	IFC

Affected files ...

.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#58 integrate
.. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/book.sgml#3 integrate
.. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/desktop/chapter.sgml#3 integrate
.. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/firewalls/chapter.sgml#3 integrate
.. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/mirrors/chapter.sgml#4 integrate
.. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/serialcomms/chapter.sgml#2 integrate
.. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/x11/chapter.sgml#2 integrate
.. //depot/projects/dtrace/src/contrib/openpam/configure.in#5 delete
.. //depot/projects/dtrace/src/games/fortune/datfiles/fortunes#29 integrate
.. //depot/projects/dtrace/src/include/unistd.h#8 integrate
.. //depot/projects/dtrace/src/lib/libc/gen/Makefile.inc#11 integrate
.. //depot/projects/dtrace/src/lib/libc/gen/feature_present.3#1 branch
.. //depot/projects/dtrace/src/lib/libc/gen/feature_present.c#1 branch
.. //depot/projects/dtrace/src/share/man/man9/VOP_LOCK.9#5 integrate
.. //depot/projects/dtrace/src/share/misc/committers-ports.dot#3 integrate
.. //depot/projects/dtrace/src/share/misc/committers-src.dot#6 integrate
.. //depot/projects/dtrace/src/sys/compat/linprocfs/linprocfs.c#15 integrate
.. //depot/projects/dtrace/src/sys/compat/linux/linux_file.c#12 integrate
.. //depot/projects/dtrace/src/sys/compat/linux/linux_getcwd.c#7 integrate
.. //depot/projects/dtrace/src/sys/compat/opensolaris/kern/opensolaris_kobj.c#2 integrate
.. //depot/projects/dtrace/src/sys/compat/opensolaris/kern/opensolaris_vfs.c#3 integrate
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/vnode.h#2 integrate
.. //depot/projects/dtrace/src/sys/compat/pecoff/imgact_pecoff.c#6 integrate
.. //depot/projects/dtrace/src/sys/compat/svr4/imgact_svr4.c#5 integrate
.. //depot/projects/dtrace/src/sys/compat/svr4/svr4_fcntl.c#8 integrate
.. //depot/projects/dtrace/src/sys/compat/svr4/svr4_misc.c#10 integrate
.. //depot/projects/dtrace/src/sys/ddb/db_textdump.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/coretemp/coretemp.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/common/cxgb_t3_cpl.h#3 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_adapter.h#5 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_main.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_sge.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/sys/cxgb_support.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/sys/uipc_mvec.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/hwpmc/hwpmc_mod.c#10 integrate
.. //depot/projects/dtrace/src/sys/dev/md/md.c#9 integrate
.. //depot/projects/dtrace/src/sys/dev/ppbus/ppbconf.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/ppbus/ppbconf.h#4 integrate
.. //depot/projects/dtrace/src/sys/fs/cd9660/cd9660_lookup.c#2 integrate
.. //depot/projects/dtrace/src/sys/fs/cd9660/cd9660_vfsops.c#3 integrate
.. //depot/projects/dtrace/src/sys/fs/coda/coda_vfsops.c#3 integrate
.. //depot/projects/dtrace/src/sys/fs/coda/coda_vnops.c#2 integrate
.. //depot/projects/dtrace/src/sys/fs/devfs/devfs_devs.c#9 integrate
.. //depot/projects/dtrace/src/sys/fs/devfs/devfs_vnops.c#15 integrate
.. //depot/projects/dtrace/src/sys/fs/fdescfs/fdesc_vfsops.c#7 integrate
.. //depot/projects/dtrace/src/sys/fs/fdescfs/fdesc_vnops.c#5 integrate
.. //depot/projects/dtrace/src/sys/fs/fifofs/fifo_vnops.c#7 integrate
.. //depot/projects/dtrace/src/sys/fs/hpfs/hpfs_vnops.c#6 integrate
.. //depot/projects/dtrace/src/sys/fs/msdosfs/msdosfs_lookup.c#6 integrate
.. //depot/projects/dtrace/src/sys/fs/msdosfs/msdosfs_vfsops.c#17 integrate
.. //depot/projects/dtrace/src/sys/fs/msdosfs/msdosfs_vnops.c#10 integrate
.. //depot/projects/dtrace/src/sys/fs/ntfs/ntfs_vfsops.c#8 integrate
.. //depot/projects/dtrace/src/sys/fs/ntfs/ntfs_vnops.c#7 integrate
.. //depot/projects/dtrace/src/sys/fs/nullfs/null_subr.c#6 integrate
.. //depot/projects/dtrace/src/sys/fs/nullfs/null_vfsops.c#7 integrate
.. //depot/projects/dtrace/src/sys/fs/nwfs/nwfs_node.c#5 integrate
.. //depot/projects/dtrace/src/sys/fs/nwfs/nwfs_vnops.c#4 integrate
.. //depot/projects/dtrace/src/sys/fs/portalfs/portal_vfsops.c#7 integrate
.. //depot/projects/dtrace/src/sys/fs/portalfs/portal_vnops.c#7 integrate
.. //depot/projects/dtrace/src/sys/fs/procfs/procfs.c#6 integrate
.. //depot/projects/dtrace/src/sys/fs/procfs/procfs_map.c#5 integrate
.. //depot/projects/dtrace/src/sys/fs/pseudofs/pseudofs_vncache.c#6 integrate
.. //depot/projects/dtrace/src/sys/fs/pseudofs/pseudofs_vnops.c#6 integrate
.. //depot/projects/dtrace/src/sys/fs/smbfs/smbfs_io.c#6 integrate
.. //depot/projects/dtrace/src/sys/fs/smbfs/smbfs_node.c#6 integrate
.. //depot/projects/dtrace/src/sys/fs/smbfs/smbfs_vnops.c#7 integrate
.. //depot/projects/dtrace/src/sys/fs/tmpfs/tmpfs_subr.c#4 integrate
.. //depot/projects/dtrace/src/sys/fs/tmpfs/tmpfs_vfsops.c#6 integrate
.. //depot/projects/dtrace/src/sys/fs/tmpfs/tmpfs_vnops.c#4 integrate
.. //depot/projects/dtrace/src/sys/fs/udf/udf_vnops.c#6 integrate
.. //depot/projects/dtrace/src/sys/fs/unionfs/union_subr.c#11 integrate
.. //depot/projects/dtrace/src/sys/fs/unionfs/union_vfsops.c#9 integrate
.. //depot/projects/dtrace/src/sys/fs/unionfs/union_vnops.c#12 integrate
.. //depot/projects/dtrace/src/sys/gnu/fs/ext2fs/ext2_lookup.c#4 integrate
.. //depot/projects/dtrace/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#10 integrate
.. //depot/projects/dtrace/src/sys/gnu/fs/ext2fs/ext2_vnops.c#6 integrate
.. //depot/projects/dtrace/src/sys/gnu/fs/ext2fs/fs.h#4 integrate
.. //depot/projects/dtrace/src/sys/gnu/fs/reiserfs/reiserfs_namei.c#5 integrate
.. //depot/projects/dtrace/src/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c#4 integrate
.. //depot/projects/dtrace/src/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#6 integrate
.. //depot/projects/dtrace/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.c#4 integrate
.. //depot/projects/dtrace/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#5 integrate
.. //depot/projects/dtrace/src/sys/i386/ibcs2/ibcs2_misc.c#10 integrate
.. //depot/projects/dtrace/src/sys/i386/ibcs2/imgact_coff.c#7 integrate
.. //depot/projects/dtrace/src/sys/i386/linux/imgact_linux.c#6 integrate
.. //depot/projects/dtrace/src/sys/kern/imgact_aout.c#5 integrate
.. //depot/projects/dtrace/src/sys/kern/imgact_elf.c#11 integrate
.. //depot/projects/dtrace/src/sys/kern/imgact_gzip.c#5 integrate
.. //depot/projects/dtrace/src/sys/kern/init_main.c#24 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_alq.c#7 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_descrip.c#17 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_exec.c#21 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_jail.c#10 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_ktrace.c#11 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_proc.c#16 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_resource.c#14 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_sig.c#18 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_synch.c#18 integrate
.. //depot/projects/dtrace/src/sys/kern/uipc_mqueue.c#11 integrate
.. //depot/projects/dtrace/src/sys/kern/uipc_syscalls.c#20 integrate
.. //depot/projects/dtrace/src/sys/kern/uipc_usrreq.c#20 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_acl.c#3 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_aio.c#11 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_bio.c#16 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_cache.c#7 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_extattr.c#3 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_lookup.c#11 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_mount.c#23 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_subr.c#26 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_syscalls.c#18 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_vnops.c#13 integrate
.. //depot/projects/dtrace/src/sys/nfs4client/nfs4_vnops.c#7 integrate
.. //depot/projects/dtrace/src/sys/nfsclient/nfs_socket.c#14 integrate
.. //depot/projects/dtrace/src/sys/nfsclient/nfs_subs.c#8 integrate
.. //depot/projects/dtrace/src/sys/nfsclient/nfs_vnops.c#11 integrate
.. //depot/projects/dtrace/src/sys/nfsserver/nfs_serv.c#8 integrate
.. //depot/projects/dtrace/src/sys/nfsserver/nfs_srvsubs.c#9 integrate
.. //depot/projects/dtrace/src/sys/security/audit/audit_arg.c#9 integrate
.. //depot/projects/dtrace/src/sys/security/audit/audit_bsm_klib.c#8 integrate
.. //depot/projects/dtrace/src/sys/security/audit/audit_worker.c#8 integrate
.. //depot/projects/dtrace/src/sys/security/mac/mac_process.c#9 integrate
.. //depot/projects/dtrace/src/sys/security/mac/mac_syscalls.c#4 integrate
.. //depot/projects/dtrace/src/sys/sys/param.h#31 integrate
.. //depot/projects/dtrace/src/sys/sys/proc.h#30 integrate
.. //depot/projects/dtrace/src/sys/sys/vnode.h#10 integrate
.. //depot/projects/dtrace/src/sys/ufs/ffs/ffs_snapshot.c#12 integrate
.. //depot/projects/dtrace/src/sys/ufs/ffs/ffs_softdep.c#13 integrate
.. //depot/projects/dtrace/src/sys/ufs/ffs/ffs_vfsops.c#17 integrate
.. //depot/projects/dtrace/src/sys/ufs/ufs/ufs_extattr.c#6 integrate
.. //depot/projects/dtrace/src/sys/ufs/ufs/ufs_lookup.c#8 integrate
.. //depot/projects/dtrace/src/sys/ufs/ufs/ufs_quota.c#9 integrate
.. //depot/projects/dtrace/src/sys/ufs/ufs/ufs_vnops.c#14 integrate
.. //depot/projects/dtrace/src/sys/vm/swap_pager.c#17 integrate
.. //depot/projects/dtrace/src/sys/vm/vm_contig.c#11 integrate
.. //depot/projects/dtrace/src/sys/vm/vm_kern.c#10 integrate
.. //depot/projects/dtrace/src/sys/vm/vm_object.c#18 integrate
.. //depot/projects/dtrace/src/sys/vm/vnode_pager.c#11 integrate
.. //depot/projects/dtrace/src/usr.bin/netstat/route.c#9 integrate
.. //depot/projects/dtrace/src/usr.sbin/arp/arp.c#7 integrate
.. //depot/projects/dtrace/src/usr.sbin/pmcstat/pmcstat.c#7 integrate
.. //depot/projects/dtrace/www/en/copyright/freebsd-doc-license.sgml#4 integrate
.. //depot/projects/dtrace/www/en/copyright/freebsd-license.sgml#4 integrate
.. //depot/projects/dtrace/www/en/gnome/Makefile#6 integrate
.. //depot/projects/dtrace/www/en/gnome/rss2.xsl#1 branch
.. //depot/projects/dtrace/www/en/index.xsl#15 integrate
.. //depot/projects/dtrace/www/en/security/Makefile#3 integrate
.. //depot/projects/dtrace/www/en/security/security-rss.xsl#1 branch
.. //depot/projects/dtrace/www/share/sgml/libcommon.xsl#6 integrate

Differences ...

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#58 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.751 2008/01/04 16:27:49 wxs Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.752 2008/01/10 17:36:14 lwhsu Exp $ -->
 <!--
 	NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
 	order by first name.
@@ -7176,6 +7176,11 @@
     </listitem>
 
     <listitem>
+      <para>Oleg Ukraincev
+	<email>oleg at ht-systems.ru</email></para>
+    </listitem>
+
+    <listitem>
       <para>Oleg V. Volkov
 	<email>rover at lglobus.ru</email></para>
     </listitem>

==== //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/book.sgml#3 (text+ko) ====

@@ -1,9 +1,9 @@
 <!--
      The FreeBSD Mongolian Documentation Project
 
-     Original revision 1.170
+     Original revision 1.172
 
-     $FreeBSD: doc/mn_MN.UTF-8/books/handbook/book.sgml,v 1.7 2007/11/20 14:53:03 keramida Exp $
+     $FreeBSD: doc/mn_MN.UTF-8/books/handbook/book.sgml,v 1.8 2008/01/10 19:36:14 keramida Exp $
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -79,12 +79,14 @@
       <year>2005</year>
       <year>2006</year>
       <year>2007</year>
+      <year>2008</year>
       <holder>FreeBSD баримтжуулах төсөл</holder>
     </copyright>
 
     <copyright>
       <year>2006</year>
       <year>2007</year>
+      <year>2008</year>
       <holder>FreeBSD-г Монголоор баримтжуулах төсөл</holder>
     </copyright>
 

==== //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/desktop/chapter.sgml#3 (text+ko) ====

@@ -1,9 +1,9 @@
 <!--
      The FreeBSD Mongolian Documentation Project
 
-     Original revision 1.74
+     Original revision 1.75
 
-     $FreeBSD: doc/mn_MN.UTF-8/books/handbook/desktop/chapter.sgml,v 1.6 2007/12/29 12:41:02 keramida Exp $
+     $FreeBSD: doc/mn_MN.UTF-8/books/handbook/desktop/chapter.sgml,v 1.7 2008/01/10 19:36:14 keramida Exp $
 -->
 
 <chapter id="desktop">
@@ -972,12 +972,12 @@
 	<secondary><application>KMyMoney</application></secondary>
       </indexterm>
 
-      <para><application>KMyMoney</application> нь KDE-д зориулсан 
-	хувийн санхүүгийн менежер юм. KMyMoney нь арилжааны зорилгоор 
+      <para><application>KMyMoney</application> нь <application>KDE</application>-д зориулсан 
+	хувийн санхүүгийн менежер юм. <application>KMyMoney</application> нь арилжааны зорилгоор 
 	хийгдсэн хувийн санхүүгийн менежер програмуудад байдаг бүх л 
 	чухал боломжуудыг өөртөө агуулсан байдаг. Бас ашиглахад хялбар, 
 	дахин оруулах зөв бүртгэлийн систем зэрэг боломжуудыг нь 
-	дурдаж болох юм. KMyMoney нь стандарт Quicken Interchange
+	дурдаж болох юм. <application>KMyMoney</application> нь стандарт Quicken Interchange
 	Format (QIF) бүхий файлуудаас импорт хийж чаддагаас гадна 
 	хөрөнгө оруулалтыг хянах, олон төрлийн мөнгөн тэмдэгтүүдтэй 
 	ажиллаж чаддаг бөгөөд баялаг тайлангуудыг гаргаж чаддаг. 

==== //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/firewalls/chapter.sgml#3 (text+ko) ====

@@ -1,9 +1,9 @@
 <!--
      The FreeBSD Mongolian Documentation Project
 
-     Original revision 1.77
+     Original revision 1.78
 
-     $FreeBSD: doc/mn_MN.UTF-8/books/handbook/firewalls/chapter.sgml,v 1.7 2007/10/21 17:59:28 keramida Exp $
+     $FreeBSD: doc/mn_MN.UTF-8/books/handbook/firewalls/chapter.sgml,v 1.8 2008/01/10 19:36:15 keramida Exp $
 -->
 
 <chapter id="firewalls">

==== //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/mirrors/chapter.sgml#4 (text+ko) ====

@@ -1,9 +1,9 @@
 <!--
      The FreeBSD Mongolian Documentation Project
 
-     Original revision 1.442
+     Original revision 1.443
 
-     $FreeBSD: doc/mn_MN.UTF-8/books/handbook/mirrors/chapter.sgml,v 1.10 2007/12/29 12:41:02 keramida Exp $
+     $FreeBSD: doc/mn_MN.UTF-8/books/handbook/mirrors/chapter.sgml,v 1.11 2008/01/10 19:36:15 keramida Exp $
 -->
 
 <appendix id="mirrors">
@@ -2525,6 +2525,24 @@
       </varlistentry>
 
       <varlistentry>
+	<term>RELENG_7</term>
+
+	<listitem>
+	  <para>FreeBSD-7.X-д зориулсан хөгжүүлэлтийн шугам, бас
+	    FreeBSD 7-STABLE гэгддэг</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term>RELENG_7_0</term>
+
+	<listitem>
+	  <para>FreeBSD-7.0-д зориулсан хувилбарын салбар, аюулгүй байдлын зөвлөгөөнүүд болон бусад 
+		чухал засваруудад зориулж зөвхөн ашиглагддаг.</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
 	<term>RELENG_6</term>
 
 	<listitem>
@@ -2534,6 +2552,15 @@
       </varlistentry>
 
       <varlistentry>
+	<term>RELENG_6_3</term>
+
+	<listitem>
+	  <para>FreeBSD-6.3-д зориулсан хувилбарын салбар, аюулгүй байдлын зөвлөгөөнүүд болон бусад 
+		чухал засваруудад зориулж зөвхөн ашиглагддаг.</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
 	<term>RELENG_6_2</term>
 
 	<listitem>
@@ -2753,6 +2780,22 @@
 
     <variablelist>
       <varlistentry>
+	<term>RELENG_7_0_0_RELEASE</term>
+
+	<listitem>
+	  <para>FreeBSD 7.0</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term>RELENG_6_3_0_RELEASE</term>
+
+	<listitem>
+	  <para>FreeBSD 6.3</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
 	<term>RELENG_6_2_0_RELEASE</term>
 
 	<listitem>

==== //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/serialcomms/chapter.sgml#2 (text+ko) ====

@@ -1,9 +1,9 @@
 <!--
      The FreeBSD Mongolian Documentation Project
 
-     Original revision 1.119
+     Original revision 1.120
 
-     $FreeBSD: doc/mn_MN.UTF-8/books/handbook/serialcomms/chapter.sgml,v 1.4 2007/06/12 08:37:51 keramida Exp $
+     $FreeBSD: doc/mn_MN.UTF-8/books/handbook/serialcomms/chapter.sgml,v 1.5 2008/01/10 19:36:15 keramida Exp $
 -->
 
 <chapter id="serialcomms">

==== //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/x11/chapter.sgml#2 (text+ko) ====

@@ -1,9 +1,9 @@
 <!--
      The FreeBSD Mongolian Documentation Project
 
-     Original revision 1.184
+     Original revision 1.185
 
-     $FreeBSD: doc/mn_MN.UTF-8/books/handbook/x11/chapter.sgml,v 1.6 2007/07/10 09:27:26 keramida Exp $
+     $FreeBSD: doc/mn_MN.UTF-8/books/handbook/x11/chapter.sgml,v 1.7 2008/01/10 19:36:15 keramida Exp $
 -->
 
 <chapter id="x11">
@@ -411,8 +411,16 @@
     <sect2>
       <title>X11-н тохиргоо</title>
 
-      <para>X11-г тохируулах нь олон үе шаттай явц билээ. Хамгийн эхний
-	    алхам бол анхдагч тохируулгын файлыг бэлдэх билээ.
+      <para>7.3 хувилбараас эхлэн <application>&xorg;</application> нь 
+	ямар нэгэн тохиргооны файлгүйгээр тушаал хүлээх мөрөн дээр доор 
+	дурдсаныг бичин ихэвчлэн ажиллах боломжтой байдаг:</para>
+	 
+      <screen>&prompt.user; <userinput>startx</userinput></screen>
+
+      <para>Хэрэв энэ нь ажиллахгүй, эсвэл анхдагч тохиргоог хүлээн 
+	авах боломжгүй бол X11-ийг гараар тохируулах шаардлагатай.
+	X11-г тохируулах нь олон үе шаттай явц билээ. Хамгийн эхний
+	алхам бол анхдагч тохируулгын файлыг бэлдэх билээ.
         Супер хэрэглэгчийн эрхээр ердөө л дараах тушаалыг өгнө:</para>
 
       <screen>&prompt.root; <userinput>Xorg -configure</userinput></screen>

==== //depot/projects/dtrace/src/games/fortune/datfiles/fortunes#29 (text+ko) ====

@@ -1,5 +1,5 @@
 This fortune brought to you by:
-$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.254 2007/12/28 17:57:25 wilko Exp $
+$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.255 2008/01/10 14:51:24 des Exp $
 %
 =======================================================================
 ||								     ||
@@ -45342,6 +45342,9 @@
 compassion.
 		-- Saul Alinsky
 %
+The fall of the USSR proves you wrong.
+		-- Aryeh M. Friedman
+%
 The famous politician was trying to save both his faces.
 %
 The farther you go, the less you know.

==== //depot/projects/dtrace/src/include/unistd.h#8 (text+ko) ====

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)unistd.h	8.12 (Berkeley) 4/27/95
- * $FreeBSD: src/include/unistd.h,v 1.80 2006/12/14 21:42:03 pjd Exp $
+ * $FreeBSD: src/include/unistd.h,v 1.81 2008/01/10 22:11:20 jhb Exp $
  */
 
 #ifndef _UNISTD_H_
@@ -480,6 +480,7 @@
 void	 endusershell(void);
 int	 exect(const char *, char * const *, char * const *);
 int	 execvP(const char *, const char *, char * const *);
+int	 feature_present(const char *);
 char	*fflagstostr(u_long);
 int	 getdomainname(char *, int);
 int	 getgrouplist(const char *, gid_t, gid_t *, int *);

==== //depot/projects/dtrace/src/lib/libc/gen/Makefile.inc#11 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.6 (Berkeley) 5/4/95
-# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.129 2008/01/08 21:58:13 jhb Exp $
+# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.130 2008/01/10 22:11:21 jhb Exp $
 
 # machine-independent gen sources
 .PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen
@@ -10,7 +10,7 @@
 	clock.c closedir.c confstr.c \
 	crypt.c ctermid.c daemon.c devname.c dirname.c disklabel.c \
 	dlfcn.c dlfunc.c drand48.c erand48.c err.c errlst.c errno.c \
-	exec.c fmtcheck.c fmtmsg.c fnmatch.c \
+	exec.c feature_present.c fmtcheck.c fmtmsg.c fnmatch.c \
 	fpclassify.c frexp.c fstab.c ftok.c fts.c ftw.c \
 	getbootfile.c getbsize.c \
 	getcap.c getcwd.c getdomainname.c getgrent.c getgrouplist.c \
@@ -45,7 +45,8 @@
 	basename.3 check_utility_compat.3 clock.3 \
 	confstr.3 ctermid.3 daemon.3 devname.3 directory.3 dirname.3 \
 	dladdr.3 dlinfo.3 dllockinit.3 dlopen.3 \
-	err.3 exec.3 fmtcheck.3 fmtmsg.3 fnmatch.3 fpclassify.3 frexp.3 \
+	err.3 exec.3 \
+	feature_present.3 fmtcheck.3 fmtmsg.3 fnmatch.3 fpclassify.3 frexp.3 \
 	ftok.3 fts.3 ftw.3 \
 	getbootfile.3 getbsize.3 getcap.3 getcontext.3 getcwd.3 \
 	getdiskbyname.3 getdomainname.3 getfsent.3 \

==== //depot/projects/dtrace/src/share/man/man9/VOP_LOCK.9#5 (text+ko) ====

@@ -26,9 +26,9 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man9/VOP_LOCK.9,v 1.19 2007/12/28 00:38:12 attilio Exp $
+.\" $FreeBSD: src/share/man/man9/VOP_LOCK.9,v 1.21 2008/01/10 19:11:37 brueffer Exp $
 .\"
-.Dd December 27, 2007
+.Dd January 10, 2008
 .Os
 .Dt VOP_LOCK 9
 .Sh NAME
@@ -48,7 +48,7 @@
 .Ft int
 .Fn VOP_ISLOCKED "struct vnode *vp" "struct thread *td"
 .Ft int
-.Fn vn_lock "struct vnode *vp" "int flags" "struct thread *td"
+.Fn vn_lock "struct vnode *vp" "int flags"
 .Sh DESCRIPTION
 These calls are used to serialize access to the file system, such as
 to prevent two writes to the same file from happening at the
@@ -110,6 +110,9 @@
 to lock a vnode rather than calling
 .Fn VOP_LOCK
 directly.
+.Fn vn_lock
+also does not want a thread specified as argument but it
+assumes curthread to be used.
 .Sh RETURN VALUES
 Zero is returned on success, otherwise an error is returned.
 .Sh PSEUDOCODE

==== //depot/projects/dtrace/src/share/misc/committers-ports.dot#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/misc/committers-ports.dot,v 1.64 2007/11/01 16:08:25 brix Exp $
+# $FreeBSD: src/share/misc/committers-ports.dot,v 1.65 2008/01/10 01:25:40 edwin Exp $
 
 # This file is meant to list all FreeBSD ports committers and describe the
 # mentor-mentee relationships between them.
@@ -95,9 +95,11 @@
 lbr [label="Lars Balker Rasmussen\nlbr at FreeBSD.org\n2006/04/30"]
 leeym [label="Yen-Ming Lee\nleeym at FreeBSD.org\n2002/08/14"]
 lev [label="Lev Serebryakov\nlev at FreeBSD.org\n2003/06/17"]
+linimon [label="Mark Linimon\nlinimon at FreeBSD.org\n2003/10/23"]
 lioux [label="Mario Sergio Fujikawa Ferriera\nlioux at FreeBSD.org\n2000/10/14"]
 lth [label="Lars Thegler\nlth at FreeBSD.org\n2004/05/04"]
 lwhsu [label="Li-Wen Hsu\nlwhsu at FreeBSD.org\n2007/04/03"]
+lx [label="David Thiel\nlx at FreeBSD.org\n2006/11/29"]
 maho [label="Maho Nakata\nmaho at FreeBSD.org\n2002/10/17"]
 marcus [label="Joe Marcus Clarke\nmarcus at FreeBSD.org\n2002/04/05"]
 markus [label="Markus Brueffer\nmarkus at FreeBSD.org\n2004/02/21"]
@@ -171,6 +173,8 @@
 
 edwin -> cperciva
 edwin -> erwin
+edwin -> linimon
+edwin -> lx
 
 ehaupt -> db
 

==== //depot/projects/dtrace/src/share/misc/committers-src.dot#6 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/misc/committers-src.dot,v 1.68 2008/01/01 10:25:01 weongyo Exp $
+# $FreeBSD: src/share/misc/committers-src.dot,v 1.70 2008/01/10 01:25:40 edwin Exp $
 
 # This file is meant to list all FreeBSD src committers and describe the
 # mentor-mentee relationships between them.
@@ -79,6 +79,7 @@
 dhartmei [label="Daniel Hartmeier\ndhartmei at FreeBSD.org\n2004/04/06"]
 dmlb [label="Duncan Barclay\ndmlb at FreeBSD.org\n2001/12/14"]
 dwmalone [label="David Malone\ndwmalone at FreeBSD.org\n2000/07/11"]
+edwin [label="Edwin Groothuis\nedwin at FreeBSD.org\n2007/06/25"]
 eik [label="Oliver Eikemeier\neik at FreeBSD.org\n2004/05/20"]
 emaste [label="Ed Maste\nemaste at FreeBSD.org\n2005/10/04"]
 emax [label="Maksim Yevmenkin\nemax at FreeBSD.org\n2003/10/12"]
@@ -233,6 +234,7 @@
 gnn -> jinmei
 gnn -> rrs
 
+grog -> edwin
 grog -> le
 
 imp -> akiyama

==== //depot/projects/dtrace/src/sys/compat/linprocfs/linprocfs.c#15 (text+ko) ====

@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.117 2007/11/29 06:34:29 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.118 2008/01/10 01:10:41 attilio Exp $");
 
 #include <sys/param.h>
 #include <sys/queue.h>
@@ -933,7 +933,7 @@
 			if (vp) {
 				vn_fullpath(td, vp, &name, &freename);
 				locked = VFS_LOCK_GIANT(vp->v_mount);
-				vn_lock(vp, LK_SHARED | LK_RETRY, td);
+				vn_lock(vp, LK_SHARED | LK_RETRY);
 				VOP_GETATTR(vp, &vat, td->td_ucred, td);
 				ino = vat.va_fileid;
 				vput(vp);

==== //depot/projects/dtrace/src/sys/compat/linux/linux_file.c#12 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.107 2007/12/29 14:28:01 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.108 2008/01/10 01:10:41 attilio Exp $");
 
 #include "opt_compat.h"
 #include "opt_mac.h"
@@ -452,7 +452,7 @@
 	buflen = max(LINUX_DIRBLKSIZ, nbytes);
 	buflen = min(buflen, MAXBSIZE);
 	buf = malloc(buflen, M_TEMP, M_WAITOK);
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 
 again:
 	aiov.iov_base = buf;

==== //depot/projects/dtrace/src/sys/compat/linux/linux_getcwd.c#7 (text+ko) ====

@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_getcwd.c,v 1.28 2007/10/24 19:03:52 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_getcwd.c,v 1.29 2008/01/10 01:10:42 attilio Exp $");
 
 #include "opt_compat.h"
 #include "opt_mac.h"
@@ -325,7 +325,7 @@
 	 *	uvp is either NULL, or locked and held.
 	 */
 
-	error = vn_lock(lvp, LK_EXCLUSIVE | LK_RETRY, td);
+	error = vn_lock(lvp, LK_EXCLUSIVE | LK_RETRY);
 	if (error != 0)
 		panic("vn_lock LK_RETRY returned error %d", error);
 	if (bufp)
@@ -378,7 +378,7 @@
 				goto out;
 			}
 			VREF(lvp);
-			error = vn_lock(lvp, LK_EXCLUSIVE | LK_RETRY, td);
+			error = vn_lock(lvp, LK_EXCLUSIVE | LK_RETRY);
 			if (error != 0)
 				panic("vn_lock LK_RETRY returned %d", error);
 		}

==== //depot/projects/dtrace/src/sys/compat/opensolaris/kern/opensolaris_kobj.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/opensolaris/kern/opensolaris_kobj.c,v 1.4 2007/05/31 11:51:49 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/opensolaris/kern/opensolaris_kobj.c,v 1.5 2008/01/10 01:10:42 attilio Exp $");
 
 #include <sys/types.h>
 #include <sys/systm.h>
@@ -123,7 +123,7 @@
 	struct vattr va;
 	int error;
 
-	vn_lock(vp, LK_SHARED | LK_RETRY, td);
+	vn_lock(vp, LK_SHARED | LK_RETRY);
 	error = VOP_GETATTR(vp, &va, td->td_ucred, td);
 	VOP_UNLOCK(vp, 0, td);
 	if (error == 0)
@@ -176,7 +176,7 @@
 	auio.uio_resid = size;
 	auio.uio_td = td;
 
-	vn_lock(vp, LK_SHARED | LK_RETRY, td);
+	vn_lock(vp, LK_SHARED | LK_RETRY);
 	error = VOP_READ(vp, &auio, IO_UNIT | IO_SYNC, td->td_ucred);
 	VOP_UNLOCK(vp, 0, td);
 	return (error != 0 ? -1 : size - auio.uio_resid);

==== //depot/projects/dtrace/src/sys/compat/opensolaris/kern/opensolaris_vfs.c#3 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/opensolaris/kern/opensolaris_vfs.c,v 1.7 2007/11/01 08:58:29 pjd Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/opensolaris/kern/opensolaris_vfs.c,v 1.8 2008/01/10 01:10:42 attilio Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -192,7 +192,7 @@
 	/*
 	 * Allocate and initialize the filesystem.
 	 */
-	vn_lock(vp, LK_SHARED | LK_RETRY, td);
+	vn_lock(vp, LK_SHARED | LK_RETRY);
 	mp = vfs_mount_alloc(vp, vfsp, fspath, td);
 	VOP_UNLOCK(vp, 0, td);
 
@@ -238,7 +238,7 @@
 	 * mnt_optnew.
 	*/
 	mp->mnt_optnew = NULL;
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	/*
 	 * Put the new filesystem on the mount list after root.
 	 */

==== //depot/projects/dtrace/src/sys/compat/opensolaris/sys/vnode.h#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/compat/opensolaris/sys/vnode.h,v 1.3 2007/05/31 11:51:49 kib Exp $
+ * $FreeBSD: src/sys/compat/opensolaris/sys/vnode.h,v 1.4 2008/01/10 01:10:42 attilio Exp $
  */
 
 #ifndef _OPENSOLARIS_SYS_VNODE_H_
@@ -222,7 +222,7 @@
 	vfslocked = VFS_LOCK_GIANT(vp->v_mount);
 	if ((error = vn_start_write(vp, &mp, V_WAIT | PCATCH)) != 0)
 		goto drop;
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	error = VOP_FSYNC(vp, MNT_WAIT, td);
 	VOP_UNLOCK(vp, 0, td);
 	vn_finished_write(mp);

==== //depot/projects/dtrace/src/sys/compat/pecoff/imgact_pecoff.c#6 (text+ko) ====

@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/pecoff/imgact_pecoff.c,v 1.41 2007/11/05 11:36:11 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/pecoff/imgact_pecoff.c,v 1.42 2008/01/10 01:10:42 attilio Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -598,7 +598,7 @@
 	error = exec_pecoff_coff_makecmds(imgp, fp, peofs);
 fail:   
 	free(fp, M_TEMP);
-        vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY, td);
+        vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY);
 	return error;
 }
 

==== //depot/projects/dtrace/src/sys/compat/svr4/imgact_svr4.c#5 (text+ko) ====

@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/svr4/imgact_svr4.c,v 1.26 2007/11/05 11:36:11 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/svr4/imgact_svr4.c,v 1.27 2008/01/10 01:10:42 attilio Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -231,7 +231,7 @@
     
     imgp->proc->p_sysent = &svr4_sysvec;
 fail:
-    vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY, td);
+    vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY);
     return (error);
 }
 

==== //depot/projects/dtrace/src/sys/compat/svr4/svr4_fcntl.c#8 (text+ko) ====

@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_fcntl.c,v 1.41 2007/10/24 19:03:52 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_fcntl.c,v 1.42 2008/01/10 01:10:42 attilio Exp $");
 
 #include "opt_mac.h"
 
@@ -270,7 +270,7 @@
 	}
 
 #ifdef MAC
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	error = mac_vnode_check_revoke(td->td_ucred, vp);
 	VOP_UNLOCK(vp, 0, td);
 	if (error)

==== //depot/projects/dtrace/src/sys/compat/svr4/svr4_misc.c#10 (text+ko) ====

@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.98 2007/10/24 19:03:52 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.99 2008/01/10 01:10:43 attilio Exp $");
 
 #include "opt_mac.h"
 
@@ -278,7 +278,7 @@
 	buflen = max(DIRBLKSIZ, nbytes);
 	buflen = min(buflen, MAXBSIZE);
 	buf = malloc(buflen, M_TEMP, M_WAITOK);
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 again:
 	aiov.iov_base = buf;
 	aiov.iov_len = buflen;
@@ -447,7 +447,7 @@
 
 	buflen = min(MAXBSIZE, uap->nbytes);
 	buf = malloc(buflen, M_TEMP, M_WAITOK);
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	off = fp->f_offset;
 again:
 	aiov.iov_base = buf;
@@ -620,7 +620,7 @@
 	VREF(vp);
 	fdrop(fp, td);
 	vfslocked = VFS_LOCK_GIANT(vp->v_mount);
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	error = change_dir(vp, td);
 	if (error)
 		goto fail;

==== //depot/projects/dtrace/src/sys/ddb/db_textdump.c#2 (text+ko) ====

@@ -25,12 +25,12 @@
  */
 
 /*-
- * Kernel text-dump support: allow a series of text files to be written to
- * the dump partition for later recovery, including captured DDB output, the
- * kernel configuration, message buffer, panic message, etc.  This allows for
- * a more compact representation of critical debugging information than
- * traditional binary dumps, as well as allowing dump information to be used
- * without access to kernel symbols, source code, etc.
+ * Kernel text-dump support: write a series of text files to the dump
+ * partition for later recovery, including captured DDB output, kernel
+ * configuration, message buffer, and panic message.  This allows for a more
+ * compact representation of critical debugging information than traditional
+ * binary dumps, as well as allowing dump information to be used without
+ * access to kernel symbols, source code, etc.
  *
  * Storage Layout
  * --------------
@@ -46,9 +46,8 @@
  * know to reverse the order of the blocks in order to produce a readable
  * file.
  *
- * Data is written out in the 'tar' file format, as it provides the facility
- * to write data incrementally as a stream without reference to previous
- * files.
+ * Data is written out in the ustar file format so that we can write data
+ * incrementally as a stream without reference to previous files.
  *
  * TODO
  * ----
@@ -58,7 +57,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/ddb/db_textdump.c,v 1.1 2007/12/26 11:32:32 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/ddb/db_textdump.c,v 1.2 2008/01/10 00:26:47 rwatson Exp $");
 
 #include "opt_config.h"
 
@@ -201,7 +200,7 @@
 }
 
 /*
- * Calculate and fill in the checksum for a tar header.
+ * Calculate and fill in the checksum for a ustar header.
  */
 static void
 ustar_checksum(struct ustar_header *uhp)
@@ -269,6 +268,9 @@
  * Interfaces to save and restore the dump offset, so that printers can go
  * back to rewrite a header if required, while avoiding their knowing about
  * the global layout of the blocks.
+ *
+ * If we ever want to support writing textdumps to tape or other
+ * stream-oriented target, we'll need to remove this.
  */
 void
 textdump_saveoff(off_t *offsetp)

==== //depot/projects/dtrace/src/sys/dev/coretemp/coretemp.c#3 (text+ko) ====

@@ -23,7 +23,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/dev/coretemp/coretemp.c,v 1.4 2007/10/15 20:00:21 netchild Exp $
+ * $FreeBSD: src/sys/dev/coretemp/coretemp.c,v 1.5 2008/01/10 16:09:22 rpaulo Exp $
  *
  */
 
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/coretemp/coretemp.c,v 1.4 2007/10/15 20:00:21 netchild Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/coretemp/coretemp.c,v 1.5 2008/01/10 16:09:22 rpaulo Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -143,6 +143,11 @@
 	cpu_model += ((cpu_id >> 16) & 0xf) << 4;
 	cpu_mask = cpu_id & 15;
 
+#if 0 /*
+       * XXXrpaulo: I have this CPU model and when it returns from C3
+       * coretemp continues to function properly.
+       */
+	 
 	/*
 	 * Check for errata AE18.
 	 * "Processor Digital Thermal Sensor (DTS) Readout stops
@@ -159,6 +164,7 @@
 			return (ENXIO);
 		}
 	}
+#endif
 	/*
 	 * On some Core 2 CPUs, there's an undocumented MSR that
 	 * can tell us if Tj(max) is 100 or 85.

==== //depot/projects/dtrace/src/sys/dev/cxgb/common/cxgb_t3_cpl.h#3 (text+ko) ====

@@ -25,7 +25,7 @@
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
-$FreeBSD: src/sys/dev/cxgb/common/cxgb_t3_cpl.h,v 1.5 2007/12/17 08:17:50 kmacy Exp $
+$FreeBSD: src/sys/dev/cxgb/common/cxgb_t3_cpl.h,v 1.6 2008/01/10 00:55:42 kmacy Exp $
 
 ***************************************************************************/
 #ifndef T3_CPL_H
@@ -306,6 +306,7 @@
 #define S_WR_GEN    31
 #define V_WR_GEN(x) ((x) << S_WR_GEN)
 #define F_WR_GEN    V_WR_GEN(1U)
+#define G_WR_GEN(x) ((x) >> S_WR_GEN)
 
 # define WR_HDR struct work_request_hdr wr
 # define RSS_HDR

==== //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_adapter.h#5 (text+ko) ====

@@ -26,7 +26,7 @@
 POSSIBILITY OF SUCH DAMAGE.
 
 
-$FreeBSD: src/sys/dev/cxgb/cxgb_adapter.h,v 1.23 2008/01/09 08:12:24 kmacy Exp $
+$FreeBSD: src/sys/dev/cxgb/cxgb_adapter.h,v 1.25 2008/01/11 02:26:54 kmacy Exp $
 
 ***************************************************************************/
 
@@ -196,12 +196,7 @@
 	uint32_t	holdoff_tmr;
 	uint32_t	next_holdoff;
 	uint32_t        imm_data;
-	struct rsp_desc	*desc;
 	uint32_t	cntxt_id;
-	struct mtx      lock;
-	struct mbuf     *rx_head;    /* offload packet receive queue head */
-	struct mbuf     *rx_tail;    /* offload packet receive queue tail */
-
 	uint32_t        offload_pkts;
 	uint32_t        offload_bundles;
 	uint32_t        pure_rsps;
@@ -212,9 +207,12 @@
 	bus_dmamap_t	desc_map;
 
 	struct t3_mbuf_hdr rspq_mh;
+	struct rsp_desc	*desc;
+	struct mtx      lock;
 #define RSPQ_NAME_LEN  32
 	char            lockbuf[RSPQ_NAME_LEN];
-
+	uint32_t	rspq_dump_start;
+	uint32_t	rspq_dump_count;
 };
 
 #ifndef DISABLE_MBUF_IOVEC
@@ -231,8 +229,6 @@
 	uint32_t	cidx;
 	uint32_t	pidx;
 	uint32_t	gen;
-	struct rx_desc	*desc;
-	struct rx_sw_desc *sdesc;
 	bus_addr_t	phys_addr;
 	uint32_t	cntxt_id;
 	uint64_t	empty;
@@ -240,6 +236,8 @@
 	bus_dmamap_t	desc_map;
 	bus_dma_tag_t   entry_tag;
 	uma_zone_t      zone;
+	struct rx_desc	*desc;
+	struct rx_sw_desc *sdesc;
 	int             type;
 };
 
@@ -551,6 +549,7 @@
 int t3_encap(struct sge_qset *, struct mbuf **, int);
 
 int t3_sge_init_adapter(adapter_t *);
+int t3_sge_reset_adapter(adapter_t *);
 int t3_sge_init_port(struct port_info *);
 void t3_sge_deinit_sw(adapter_t *);
 void t3_free_tx_desc(struct sge_txq *q, int n);
@@ -620,5 +619,5 @@
 int cxgb_dequeue_packet(struct ifnet *, struct sge_txq *, struct mbuf **);
 void cxgb_start(struct ifnet *ifp);
 void refill_fl_service(adapter_t *adap, struct sge_fl *fl);
-
+int reclaim_completed_tx(struct sge_txq *q, int reclaim_min);
 #endif

==== //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_main.c#4 (text+ko) ====

@@ -28,7 +28,7 @@
 ***************************************************************************/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_main.c,v 1.41 2007/12/17 23:39:28 kmacy Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_main.c,v 1.43 2008/01/11 02:26:54 kmacy Exp $");
 
 #include <sys/param.h>

>>> TRUNCATED FOR MAIL (1000 lines) <<<

More information about the p4-projects mailing list