From owner-p4-projects@FreeBSD.ORG Sun Sep 26 09:10:20 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BB0671065695; Sun, 26 Sep 2010 09:10: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 76FC51065693 for ; Sun, 26 Sep 2010 09:10:20 +0000 (UTC) (envelope-from remko@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 64A828FC0A for ; Sun, 26 Sep 2010 09:10: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 o8Q9AKQG087817 for ; Sun, 26 Sep 2010 09:10:20 GMT (envelope-from remko@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o8Q9AKBF087812 for perforce@freebsd.org; Sun, 26 Sep 2010 09:10:20 GMT (envelope-from remko@freebsd.org) Date: Sun, 26 Sep 2010 09:10:20 GMT Message-Id: <201009260910.o8Q9AKBF087812@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to remko@freebsd.org using -f From: Remko Lodder To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 184201 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, 26 Sep 2010 09:10:21 -0000 http://p4web.freebsd.org/@@184201?ac=10 Change 184201 by remko@remko_guardian on 2010/09/26 09:09:22 Version bump, no functional changes. Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/install/chapter.sgml#18 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/install/chapter.sgml#18 (text+ko) ==== @@ -4,7 +4,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/install/chapter.sgml,v 1.18 2010/09/06 09:48:27 remko Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/install/chapter.sgml - %SRCID% 1.412 + %SRCID% 1.413 --> From owner-p4-projects@FreeBSD.ORG Mon Sep 27 11:58:52 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF0B11065672; Mon, 27 Sep 2010 11:58: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 B1F12106566C for ; Mon, 27 Sep 2010 11:58:51 +0000 (UTC) (envelope-from niels@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 9FB718FC08 for ; Mon, 27 Sep 2010 11:58: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 o8RBwp2j032947 for ; Mon, 27 Sep 2010 11:58:51 GMT (envelope-from niels@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o8RBwpbu032944 for perforce@freebsd.org; Mon, 27 Sep 2010 11:58:51 GMT (envelope-from niels@freebsd.org) Date: Mon, 27 Sep 2010 11:58:51 GMT Message-Id: <201009271158.o8RBwpbu032944@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to niels@freebsd.org using -f From: Niels Heinen To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 184227 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: Mon, 27 Sep 2010 11:58:52 -0000 http://p4web.freebsd.org/@@184227?ac=10 Change 184227 by niels@niels_devbsd on 2010/09/27 11:58:22 Fixed compilation error caused by two small typo's Approved by: rwatson Affected files ... .. //depot/projects/trustedbsd/capabilities/src/usr.bin/gzip/gzip.c#13 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/usr.bin/gzip/gzip.c#13 (text+ko) ==== @@ -1093,8 +1093,8 @@ if (fchmod(fd, sb.st_mode) < 0) maybe_warn("couldn't fchmod: %s", file); - TIMESPEC_TO_TIMEVAL(×[0], &sb.st_atim); - TIMESPEC_TO_TIMEVAL(×[1], &sb.st_mtim); + TIMESPEC_TO_TIMEVAL(×[0], &sb.st_atimespec); + TIMESPEC_TO_TIMEVAL(×[1], &sb.st_mtimespec); if (futimes(fd, times) < 0) maybe_warn("couldn't utimes: %s", file); From owner-p4-projects@FreeBSD.ORG Mon Sep 27 19:07:30 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C5238106566C; Mon, 27 Sep 2010 19:07:30 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 85DFE1065672 for ; Mon, 27 Sep 2010 19:07:30 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 71AF58FC15 for ; Mon, 27 Sep 2010 19:07:30 +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 o8RJ7U70024113 for ; Mon, 27 Sep 2010 19:07:30 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o8RJ7Uft024110 for perforce@freebsd.org; Mon, 27 Sep 2010 19:07:30 GMT (envelope-from rene@FreeBSD.org) Date: Mon, 27 Sep 2010 19:07:30 GMT Message-Id: <201009271907.o8RJ7Uft024110@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 184238 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: Mon, 27 Sep 2010 19:07:31 -0000 http://p4web.freebsd.org/@@184238?ac=10 Change 184238 by rene@rene_acer on 2010/09/27 19:07:07 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#71 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#52 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/portbuild/article.sgml#26 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/install/chapter.sgml#11 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#88 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#45 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#52 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/config/chapter.sgml#21 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/install/chapter.sgml#19 integrate .. //depot/projects/docproj_nl/share/pgpkeys/ehaupt.key#2 integrate .. //depot/projects/docproj_nl/share/pgpkeys/martymac.key#1 branch .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#45 integrate .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#42 integrate .. //depot/projects/docproj_nl/share/pgpkeys/sunpoet.key#1 branch .. //depot/projects/docproj_nl/www/en/cgi/man.cgi#18 integrate .. //depot/projects/docproj_nl/www/en/developers.sgml#43 integrate .. //depot/projects/docproj_nl/www/en/donations/donors.sgml#35 integrate .. //depot/projects/docproj_nl/www/en/donations/wantlist.sgml#22 integrate .. //depot/projects/docproj_nl/www/en/portmgr/Makefile#2 integrate .. //depot/projects/docproj_nl/www/en/portmgr/index.sgml#3 integrate .. //depot/projects/docproj_nl/www/en/portmgr/policies.sgml#2 integrate .. //depot/projects/docproj_nl/www/en/portmgr/policies_releng_4.sgml#2 delete .. //depot/projects/docproj_nl/www/en/portmgr/policies_releng_6.sgml#1 branch .. //depot/projects/docproj_nl/www/share/sgml/advisories.xml#18 integrate .. //depot/projects/docproj_nl/www/share/sgml/news.xml#90 integrate .. //depot/projects/docproj_nl/www/share/sgml/usergroups.xml#16 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#71 (text+ko) ==== @@ -1,4 +1,4 @@ - + + @@ -442,44 +442,6 @@ ddd's graphical interface. - - Post-Mortem Analysis of a Dump - - What do you do if a kernel dumped core but you did not expect it, - and it is therefore not compiled using config -g? Not - everything is lost here. Do not panic! - - Of course, you still need to enable crash dumps. See above for the - options you have to specify in order to do this. - - Go to your kernel config directory - (/usr/src/sys/arch/conf) - and edit your configuration file. Uncomment (or add, if it does not - exist) the following line: - - makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols - - Rebuild the kernel. Due to the time stamp change on the Makefile, - some other object files will be rebuilt, for example - trap.o. With a bit of luck, the added - option will not change anything for the generated - code, so you will finally get a new kernel with similar code to the - faulting one but with some debugging symbols. You should at least verify the - old and new sizes with the &man.size.1; command. If there is a - mismatch, you probably need to give up here. - - Go and examine the dump as described above. The debugging symbols - might be incomplete for some places, as can be seen in the stack trace - in the example above where some functions are displayed without line - numbers and argument lists. If you need more debugging symbols, remove - the appropriate object files, recompile the kernel again and repeat the - gdb - session until you know enough. - - All this is not guaranteed to work, but it will do it fine in most - cases. - - On-Line Kernel Debugging Using DDB @@ -769,65 +731,6 @@ window), etc. - - Debugging Loadable Modules Using GDB - - When debugging a panic that occurred within a module, or - using remote GDB against a machine that uses dynamic modules, - you need to tell GDB how to obtain symbol information for those - modules. - - First, you need to build the module(s) with debugging - information: - - &prompt.root; cd /sys/modules/linux -&prompt.root; make clean; make COPTS=-g - - If you are using remote GDB, you can run - kldstat on the target machine to find out - where the module was loaded: - - &prompt.root; kldstat -Id Refs Address Size Name - 1 4 0xc0100000 1c1678 kernel - 2 1 0xc0a9e000 6000 linprocfs.ko - 3 1 0xc0ad7000 2000 warp_saver.ko - 4 1 0xc0adc000 11000 linux.ko - - If you are debugging a crash dump, you will need to walk the - linker_files list, starting at - linker_files->tqh_first and following the - link.tqe_next pointers until you find the - entry with the filename you are looking for. - The address member of that entry is the load - address of the module. - - Next, you need to find out the offset of the text section - within the module: - - &prompt.root; objdump --section-headers /sys/modules/linux/linux.ko | grep text - 3 .rel.text 000016e0 000038e0 000038e0 000038e0 2**2 - 10 .text 00007f34 000062d0 000062d0 000062d0 2**2 - - The one you want is the .text section, - section 10 in the above example. The fourth hexadecimal field - (sixth field overall) is the offset of the text section within - the file. Add this offset to the load address of the module to - obtain the relocation address for the module's code. In our - example, we get 0xc0adc000 + 0x62d0 = 0xc0ae22d0. Use the - add-symbol-file command in GDB to tell the - debugger about the module: - - (kgdb) add-symbol-file /sys/modules/linux/linux.ko 0xc0ae22d0 -add symbol table from file "/sys/modules/linux/linux.ko" at text_addr = 0xc0ae22d0? -(y or n) y -Reading symbols from /sys/modules/linux/linux.ko...done. -(kgdb) - - You should now have access to all the symbols in the - module. - - Debugging a Console Driver ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/install/chapter.sgml#11 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -4560,8 +4560,8 @@ off USB drives. It also supports booting into a livefs based rescue mode. The documentation packages are provided but no other - packages. This image is not available for &os;7.3 and - earlier. + packages. This image is not available for &os; 7.3 + and earlier. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#88 (text+ko) ==== @@ -1,7 +1,7 @@ Please only use characters [-+._a-zA-Z0-9] for naming your patches. Do not use any other characters besides them. Do not name your patches like patch-aa or - patch-ab etc, always mention path and file name + patch-ab etc, always mention the path and file name in patch names. Do not put RCS strings in patches. CVS will mangle them when we @@ -745,8 +745,8 @@ If you want to create a patch file based off of an existing file, you can copy it with an .orig extension, and then modify the - original one. Run makepatch, and - this will write out an appropriate patch file to the makepatch target + will write out an appropriate patch file to the files directory of the port. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#45 (text+ko) ==== @@ -13,7 +13,7 @@ builds for the other languages, and we will poke fun of you in public. - $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.523 2010/09/08 15:28:43 arved Exp $ + $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.526 2010/09/24 22:57:35 martymac Exp $ --> aaron@FreeBSD.org"> @@ -464,6 +464,8 @@ hrs@FreeBSD.org"> +hselasky@FreeBSD.org"> + hsu@FreeBSD.org"> iedowse@FreeBSD.org"> @@ -724,6 +726,8 @@ martin@FreeBSD.org"> +martymac@FreeBSD.org"> + mat@FreeBSD.org"> matk@FreeBSD.org"> @@ -1098,6 +1102,8 @@ sumikawa@FreeBSD.org"> +sunpoet@FreeBSD.org"> + suz@FreeBSD.org"> swallace@FreeBSD.org"> ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#52 (text+ko) ==== @@ -1,7 +1,7 @@ + -uid Emanuel Haupt -sub 2048g/6DD0929C 2007-02-06 [expires: 2008-02-06] +sub 2048R/F658659F 2010-09-24 [expires: 2011-09-24] ]]> ==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#45 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -566,6 +566,11 @@ &pgpkey.mich; + + &a.sunpoet; + &pgpkey.sunpoet; + + &a.lwhsu; &pgpkey.lwhsu; @@ -741,6 +746,11 @@ &pgpkey.erwin; + + &a.martymac; + &pgpkey.martymac; + + &a.glarkin; &pgpkey.glarkin; ==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#42 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -202,6 +202,7 @@ + @@ -304,6 +305,7 @@ + ==== //depot/projects/docproj_nl/www/en/cgi/man.cgi#18 (text+ko) ==== @@ -34,7 +34,7 @@ # Dual CGI/Plexus mode and new interface by sanders@bsdi.com 9/22/1995 # # $Id: man.cgi,v 1.172 2007/11/28 18:51:29 hrs Exp $ -# $FreeBSD: www/en/cgi/man.cgi,v 1.254 2010/08/09 19:37:14 wosch Exp $ +# $FreeBSD: www/en/cgi/man.cgi,v 1.255 2010/09/26 15:29:49 wosch Exp $ ############################################################################ # !!! man.cgi is stale perl4 code !!! @@ -146,6 +146,7 @@ 'CentOS Linux/i386 3.9' => { 'path' => '1:2:3:3p:4:5:6:7:8:9:n', }, 'CentOS Linux/i386 4.8' => { 'path' => '1:1p:2:3:3p:4:5:6:7:8:9:n:0p', }, 'CentOS Linux/i386 5.4' => { 'path' => '0p:1:1p:1x:2:2x:3:3p:3x:4:4x:5:5x:6:6x:7:7x:8:8x:9:9x:l:n', }, + 'CentOS Linux/i386 5.5' => { 'path' => '0p:1:1p:1x:2:2x:3:3p:3x:4:4x:5:5x:6:6x:7:7x:8:8x:9:9x:l:n', }, 'SuSE Linux/i386 4.3' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, 'SuSE Linux/i386 5.0' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, @@ -382,6 +383,7 @@ 'CentOS Linux/i386 3.9', "$manLocalDir/CentOS-3.9", 'CentOS Linux/i386 4.8', "$manLocalDir/CentOS-4.8", 'CentOS Linux/i386 5.4', "$manLocalDir/CentOS-5.4", + 'CentOS Linux/i386 5.5', "$manLocalDir/CentOS-5.5", 'SuSE Linux/i386 4.3', "$manLocalDir/SuSE-4.3-i386", 'SuSE Linux/i386 5.0', "$manLocalDir/SuSE-5.0-i386", @@ -540,7 +542,7 @@ 'slackware', 'Linux Slackware 3.1', 'redhat', 'Red Hat Linux/i386 9', - 'centos', 'CentOS Linux/i386 5.4', + 'centos', 'CentOS Linux/i386 5.5', 'suse', 'SuSE Linux/i386 11.3', 'linux', 'SuSE Linux/i386 11.3', 'darwin', 'Darwin 8.0.1/ppc', @@ -1443,7 +1445,7 @@ } local $id = - '$FreeBSD: www/en/cgi/man.cgi,v 1.254 2010/08/09 19:37:14 wosch Exp $'; + '$FreeBSD: www/en/cgi/man.cgi,v 1.255 2010/09/26 15:29:49 wosch Exp $'; return qq{\ 
 Copyright (c) 1996-2010 Wolfram Schneider

==== //depot/projects/docproj_nl/www/en/developers.sgml#43 (text+ko) ====

@@ -6,7 +6,7 @@
 us to update author names, or the representation of those names (such
 as adding email addresses), by just editing a single file.
 
-$FreeBSD: www/en/developers.sgml,v 1.264 2010/09/08 04:51:15 andreast Exp $
+$FreeBSD: www/en/developers.sgml,v 1.267 2010/09/24 23:05:14 martymac Exp $
 
 -->
 
@@ -232,6 +232,7 @@
 
 
 
+
 
 
 
@@ -362,6 +363,7 @@
 
 
 
+
 
 
 
@@ -548,6 +550,7 @@
 
 
 
+
 
 
 

==== //depot/projects/docproj_nl/www/en/donations/donors.sgml#35 (text+ko) ====

@@ -1,6 +1,6 @@
 
-
+
 
 
  %developers;
@@ -2783,7 +2783,7 @@
   
 
   
-     Travis T 
+     Travis Thaxton 
      Dell Optiplex 960 
      ade 
      received 
@@ -2795,6 +2795,13 @@
      delphij 
      received 
   
+
+  
+     Travis Thaxton
+     Dell 22" LCD monitor
+     dougb
+     received
+  
 
 
 &footer;

==== //depot/projects/docproj_nl/www/en/donations/wantlist.sgml#22 (text+ko) ====

@@ -1,6 +1,6 @@
 
-
+
 
 
 
@@ -74,14 +74,6 @@
       
 
       
-	dougb
-	CA, US
-	Laptop HD, SATA-300, 200+ Gb, good performance
-	Replace aging HD in my day-to-day laptop running
-	  FreeBSD-current
-      
-
-      
 	grehan
 	California, USA
 	Apple G4 XServe

==== //depot/projects/docproj_nl/www/en/portmgr/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: www/en/portmgr/Makefile,v 1.3 2006/05/11 22:58:42 pav Exp $
+# $FreeBSD: www/en/portmgr/Makefile,v 1.4 2010/09/17 13:29:46 tabthorpe Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
@@ -13,7 +13,7 @@
 DOCS+=	policies.sgml
 DOCS+=	policies_committing.sgml
 DOCS+=	policies_contributors.sgml
-DOCS+=	policies_releng_4.sgml
+DOCS+=	policies_releng_6.sgml
 DOCS+=	qa.sgml
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"

==== //depot/projects/docproj_nl/www/en/portmgr/index.sgml#3 (text+ko) ====

@@ -1,6 +1,6 @@
 
-
+
 
 
 
@@ -29,8 +29,8 @@
 its goals, such as
 timeouts for inactivity and
 when commits are allowed.
-Also contains the end of support policy
-on FreeBSD 4.X.

+Also contains the end of support policy
+on FreeBSD 6.X.

 
 
Implementation Issues

 

==== //depot/projects/docproj_nl/www/en/portmgr/policies.sgml#2 (text+ko) ====

@@ -1,6 +1,6 @@
 
-
+
 
 
 ]>
@@ -12,8 +12,8 @@
   Ports Management Team has adopted certain policies to try to meet
   each of its goals.

 
-
EOS/EOL Policies of Ports and Ports
-  Intrastructure on RELENG_4

+
EOS/EOL Policies of Ports and Ports
+  Intrastructure on RELENG_6

 
 
Assure The Integrity Of The Ports Collection

 

==== //depot/projects/docproj_nl/www/share/sgml/advisories.xml#18 (text+ko) ====

@@ -2,7 +2,7 @@
 
   
     
-      $FreeBSD: www/share/sgml/advisories.xml,v 1.238 2010/07/13 02:53:27 cperciva Exp $
+      $FreeBSD: www/share/sgml/advisories.xml,v 1.239 2010/09/20 15:09:26 cperciva Exp $
     
   
 
@@ -10,6 +10,18 @@
     2010
 
     
+      9
+
+      
+	20
+
+	
+	  FreeBSD-SA-10:08.bzip2
+	
+      
+    
+
+    
       7
 
       

==== //depot/projects/docproj_nl/www/share/sgml/news.xml#90 (text+ko) ====

@@ -25,7 +25,7 @@
 
   
     
-      $FreeBSD: www/share/sgml/news.xml,v 1.344 2010/09/08 10:51:20 jkois Exp $
+      $FreeBSD: www/share/sgml/news.xml,v 1.346 2010/09/24 23:29:32 martymac Exp $
     
   
 
@@ -36,6 +36,20 @@
       9
 
       
+	25
+	
+	  
New committer: Ganael Laplanche (ports)

+	
+      
+
+      
+	21
+	
+	  
New committer: Po-Chuan Hsieh (ports)

+	
+      
+
+      
         5
         
           
New committer: Andreas Tobler (src)


==== //depot/projects/docproj_nl/www/share/sgml/usergroups.xml#16 (text+ko) ====

@@ -5,7 +5,7 @@
 
   
     
-      $FreeBSD: www/share/sgml/usergroups.xml,v 1.96 2010/08/27 18:40:29 pgj Exp $
+      $FreeBSD: www/share/sgml/usergroups.xml,v 1.97 2010/09/22 18:45:40 jkois Exp $
     
   
 
@@ -203,12 +203,12 @@
         provides a regional forum for users of all Unix flavors, with
         a stress on Linux and BSD. Meetings
-        are held on the third Monday of each month at the
-        "Tomate" in B6,12 68159 Mannheim.  The
-        FIXME
-        meeting happens every first Friday of each month in
-        "Forum41" in Schwetzingen. Located in Germany,
-        Rhine-Neckar-Region.
+        are held on the third Monday of each month in Heidelberg.
+        The FIXME meeting happens
+        every first Friday of each month in the
+        RaumZeitLabor in
+        Mannheim.  Located in Germany, Rhine-Neckar-Region.
       
     
 

From owner-p4-projects@FreeBSD.ORG  Mon Sep 27 20:09:02 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E8E99106566C; Mon, 27 Sep 2010 20:09:01 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 925901065672
	for ; Mon, 27 Sep 2010 20:09:01 +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 7DFBA8FC21
	for ; Mon, 27 Sep 2010 20:09:01 +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 o8RK911e036447
	for ; Mon, 27 Sep 2010 20:09:01 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o8RK907Y036444
	for perforce@freebsd.org; Mon, 27 Sep 2010 20:09:00 GMT
	(envelope-from jhb@freebsd.org)
Date: Mon, 27 Sep 2010 20:09:00 GMT
Message-Id: <201009272009.o8RK907Y036444@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 184244 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: Mon, 27 Sep 2010 20:09:02 -0000

http://p4web.freebsd.org/@@184244?ac=10

Change 184244 by jhb@jhb_jhbbsd on 2010/09/27 20:08:16

	IFC @184243

Affected files ...

.. //depot/projects/smpng/sys/amd64/conf/GENERIC#94 integrate
.. //depot/projects/smpng/sys/arm/at91/at91_twi.c#15 integrate
.. //depot/projects/smpng/sys/boot/common/crc32.c#1 branch
.. //depot/projects/smpng/sys/boot/common/crc32.h#1 branch
.. //depot/projects/smpng/sys/boot/common/gpt.c#1 branch
.. //depot/projects/smpng/sys/boot/common/gpt.h#1 branch
.. //depot/projects/smpng/sys/boot/common/util.c#1 branch
.. //depot/projects/smpng/sys/boot/common/util.h#1 branch
.. //depot/projects/smpng/sys/boot/i386/boot2/Makefile#22 integrate
.. //depot/projects/smpng/sys/boot/i386/common/cons.c#1 branch
.. //depot/projects/smpng/sys/boot/i386/common/cons.h#1 branch
.. //depot/projects/smpng/sys/boot/i386/common/drv.c#1 branch
.. //depot/projects/smpng/sys/boot/i386/common/drv.h#1 branch
.. //depot/projects/smpng/sys/boot/i386/common/rbx.h#1 branch
.. //depot/projects/smpng/sys/boot/i386/gptboot/Makefile#3 integrate
.. //depot/projects/smpng/sys/boot/i386/gptboot/gptboot.c#7 integrate
.. //depot/projects/smpng/sys/boot/i386/gptzfsboot/Makefile#4 integrate
.. //depot/projects/smpng/sys/boot/i386/zfsboot/Makefile#4 integrate
.. //depot/projects/smpng/sys/boot/i386/zfsboot/zfsboot.c#9 integrate
.. //depot/projects/smpng/sys/boot/pc98/boot2/Makefile#20 integrate
.. //depot/projects/smpng/sys/boot/zfs/Makefile#5 integrate
.. //depot/projects/smpng/sys/boot/zfs/zfsimpl.c#11 integrate
.. //depot/projects/smpng/sys/cam/cam_xpt.c#69 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scrub.c#5 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#7 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#5 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#4 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#4 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#5 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#7 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#7 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#4 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#4 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#5 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#7 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#10 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#3 integrate
.. //depot/projects/smpng/sys/conf/files#266 integrate
.. //depot/projects/smpng/sys/conf/ldscript.mips.octeon1.64#2 integrate
.. //depot/projects/smpng/sys/conf/newvers.sh#31 integrate
.. //depot/projects/smpng/sys/crypto/aesni/aesni.c#2 integrate
.. //depot/projects/smpng/sys/crypto/aesni/aesni.h#2 integrate
.. //depot/projects/smpng/sys/crypto/aesni/aesni_wrap.c#2 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi.c#126 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_cpu.c#54 integrate
.. //depot/projects/smpng/sys/dev/ata/chipsets/ata-ahci.c#13 integrate
.. //depot/projects/smpng/sys/dev/ata/chipsets/ata-siliconimage.c#12 integrate
.. //depot/projects/smpng/sys/dev/bge/if_bge.c#118 integrate
.. //depot/projects/smpng/sys/dev/hifn/hifn7751.c#28 integrate
.. //depot/projects/smpng/sys/dev/hifn/hifn7751var.h#10 integrate
.. //depot/projects/smpng/sys/dev/mii/acphy.c#17 integrate
.. //depot/projects/smpng/sys/dev/mii/bmtphy.c#11 integrate
.. //depot/projects/smpng/sys/dev/mii/exphy.c#16 integrate
.. //depot/projects/smpng/sys/dev/mii/gentbi.c#5 integrate
.. //depot/projects/smpng/sys/dev/mii/icsphy.c#2 integrate
.. //depot/projects/smpng/sys/dev/mii/lxtphy.c#18 integrate
.. //depot/projects/smpng/sys/dev/mii/mii.h#4 integrate
.. //depot/projects/smpng/sys/dev/mii/nsphy.c#18 integrate
.. //depot/projects/smpng/sys/dev/mii/nsphyter.c#2 integrate
.. //depot/projects/smpng/sys/dev/mii/qsphy.c#16 integrate
.. //depot/projects/smpng/sys/dev/mii/tlphy.c#18 integrate
.. //depot/projects/smpng/sys/dev/mii/tlphyreg.h#3 integrate
.. //depot/projects/smpng/sys/dev/mii/ukphy.c#14 integrate
.. //depot/projects/smpng/sys/dev/mpt/mpt.c#30 integrate
.. //depot/projects/smpng/sys/dev/mpt/mpt.h#30 integrate
.. //depot/projects/smpng/sys/dev/stge/if_stge.c#15 integrate
.. //depot/projects/smpng/sys/dev/usb/net/if_axe.c#15 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdevs#159 integrate
.. //depot/projects/smpng/sys/fs/devfs/devfs.h#26 integrate
.. //depot/projects/smpng/sys/fs/devfs/devfs_devs.c#38 integrate
.. //depot/projects/smpng/sys/fs/devfs/devfs_dir.c#1 branch
.. //depot/projects/smpng/sys/fs/devfs/devfs_int.h#8 integrate
.. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#91 integrate
.. //depot/projects/smpng/sys/geom/eli/g_eli.c#29 integrate
.. //depot/projects/smpng/sys/geom/eli/g_eli.h#11 integrate
.. //depot/projects/smpng/sys/geom/eli/g_eli_crypto.c#6 integrate
.. //depot/projects/smpng/sys/geom/eli/g_eli_ctl.c#11 integrate
.. //depot/projects/smpng/sys/geom/eli/g_eli_integrity.c#3 integrate
.. //depot/projects/smpng/sys/geom/eli/g_eli_key.c#5 integrate
.. //depot/projects/smpng/sys/geom/eli/g_eli_privacy.c#2 integrate
.. //depot/projects/smpng/sys/geom/part/g_part.c#30 integrate
.. //depot/projects/smpng/sys/geom/part/g_part_gpt.c#17 integrate
.. //depot/projects/smpng/sys/geom/part/g_part_mbr.c#10 integrate
.. //depot/projects/smpng/sys/geom/part/g_part_pc98.c#12 integrate
.. //depot/projects/smpng/sys/i386/conf/GENERIC#123 integrate
.. //depot/projects/smpng/sys/i386/i386/machdep.c#160 integrate
.. //depot/projects/smpng/sys/ia64/include/_stdint.h#3 integrate
.. //depot/projects/smpng/sys/ia64/include/bus.h#22 integrate
.. //depot/projects/smpng/sys/kern/kern_clocksource.c#3 integrate
.. //depot/projects/smpng/sys/kern/kern_linker.c#108 integrate
.. //depot/projects/smpng/sys/kern/subr_kdb.c#26 integrate
.. //depot/projects/smpng/sys/kern/subr_stack.c#9 integrate
.. //depot/projects/smpng/sys/libkern/inet_ntop.c#1 branch
.. //depot/projects/smpng/sys/libkern/inet_pton.c#1 branch
.. //depot/projects/smpng/sys/mips/cavium/ciu.c#2 integrate
.. //depot/projects/smpng/sys/mips/cavium/files.octeon1#4 integrate
.. //depot/projects/smpng/sys/mips/cavium/octe/cavium-ethernet.h#2 integrate
.. //depot/projects/smpng/sys/mips/cavium/octe/ethernet-rgmii.c#2 integrate
.. //depot/projects/smpng/sys/mips/cavium/octe/ethernet-rx.c#2 integrate
.. //depot/projects/smpng/sys/mips/cavium/octe/ethernet-sgmii.c#2 integrate
.. //depot/projects/smpng/sys/mips/cavium/octe/ethernet-tx.c#2 integrate
.. //depot/projects/smpng/sys/mips/cavium/octe/ethernet-xaui.c#2 integrate
.. //depot/projects/smpng/sys/mips/cavium/octe/ethernet.c#2 integrate
.. //depot/projects/smpng/sys/mips/cavium/octe/octe.c#2 integrate
.. //depot/projects/smpng/sys/mips/cavium/octopci.c#3 integrate
.. //depot/projects/smpng/sys/mips/cavium/octopcireg.h#2 integrate
.. //depot/projects/smpng/sys/mips/include/pmap.h#17 integrate
.. //depot/projects/smpng/sys/mips/mips/pmap.c#26 integrate
.. //depot/projects/smpng/sys/mips/rmi/board.h#5 integrate
.. //depot/projects/smpng/sys/mips/rmi/pic.h#4 integrate
.. //depot/projects/smpng/sys/mips/rmi/xlr_pci.c#5 integrate
.. //depot/projects/smpng/sys/mips/sibyte/sb_zbpci.c#3 integrate
.. //depot/projects/smpng/sys/modules/krpc/Makefile#3 integrate
.. //depot/projects/smpng/sys/net/if_tap.c#55 integrate
.. //depot/projects/smpng/sys/net/if_tun.c#69 integrate
.. //depot/projects/smpng/sys/netinet/in.h#53 integrate
.. //depot/projects/smpng/sys/netinet/in_rmx.c#32 integrate
.. //depot/projects/smpng/sys/netinet/ip_output.c#121 integrate
.. //depot/projects/smpng/sys/netinet/siftr.c#3 integrate
.. //depot/projects/smpng/sys/netinet/tcp_reass.c#14 integrate
.. //depot/projects/smpng/sys/netinet/tcp_subr.c#126 integrate
.. //depot/projects/smpng/sys/netinet/tcp_var.h#79 integrate
.. //depot/projects/smpng/sys/netinet6/in6_rmx.c#27 integrate
.. //depot/projects/smpng/sys/netinet6/ip6_output.c#73 integrate
.. //depot/projects/smpng/sys/nlm/nlm_prot_impl.c#9 integrate
.. //depot/projects/smpng/sys/opencrypto/cryptodev.c#31 integrate
.. //depot/projects/smpng/sys/opencrypto/cryptodev.h#12 integrate
.. //depot/projects/smpng/sys/opencrypto/cryptosoft.c#19 integrate
.. //depot/projects/smpng/sys/opencrypto/xform.c#9 integrate
.. //depot/projects/smpng/sys/opencrypto/xform.h#5 integrate
.. //depot/projects/smpng/sys/pc98/conf/GENERIC#93 integrate
.. //depot/projects/smpng/sys/powerpc/conf/GENERIC#70 integrate
.. //depot/projects/smpng/sys/powerpc/conf/GENERIC64#4 integrate
.. //depot/projects/smpng/sys/rpc/inet_ntop.c#2 delete
.. //depot/projects/smpng/sys/rpc/inet_pton.c#2 delete
.. //depot/projects/smpng/sys/rpc/rpc_com.h#3 integrate
.. //depot/projects/smpng/sys/rpc/rpc_generic.c#4 integrate
.. //depot/projects/smpng/sys/sparc64/conf/GENERIC#107 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/elf_machdep.c#28 integrate
.. //depot/projects/smpng/sys/sun4v/conf/GENERIC#24 integrate
.. //depot/projects/smpng/sys/sys/disklabel.h#34 integrate
.. //depot/projects/smpng/sys/sys/gpt.h#11 integrate
.. //depot/projects/smpng/sys/sys/proc.h#211 integrate

Differences ...

==== //depot/projects/smpng/sys/amd64/conf/GENERIC#94 (text+ko) ====

@@ -16,7 +16,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check first
 # in NOTES.
 #
-# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.548 2010/09/10 15:03:56 ken Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.549 2010/09/24 09:04:16 davidxu Exp $
 
 cpu		HAMMER
 ident		GENERIC
@@ -55,7 +55,6 @@
 options 	SYSVSHM			# SYSV-style shared memory
 options 	SYSVMSG			# SYSV-style message queues
 options 	SYSVSEM			# SYSV-style semaphores
-options 	P1003_1B_SEMAPHORES	# POSIX-style semaphores
 options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
 options 	PRINTF_BUFR_SIZE=128	# Prevent printf output being interspersed.
 options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev

==== //depot/projects/smpng/sys/arm/at91/at91_twi.c#15 (text) ====

@@ -24,7 +24,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.15 2009/06/11 17:05:13 avg Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.17 2010/09/27 15:58:19 ticso Exp $");
 
 #include 
 #include 
@@ -338,7 +338,7 @@
 			err = EINVAL;
 			goto out;
 		}
-		if (len == 1)
+		if (len == 1 && msgs[i].flags & IIC_M_RD)
 			WR4(sc, TWI_CR, TWI_CR_START | TWI_CR_STOP);
 		else
 			WR4(sc, TWI_CR, TWI_CR_START);
@@ -348,7 +348,7 @@
 				if ((sr = RD4(sc, TWI_SR)) & TWI_SR_RXRDY) {
 					len--;
 					*buf++ = RD4(sc, TWI_RHR) & 0xff;
-					if (len == 0 && msgs[i].len != 1)
+					if (len == 1)
 						WR4(sc, TWI_CR, TWI_CR_STOP);
 				}
 			}
@@ -358,8 +358,6 @@
 			}
 		} else {
 			while (len--) {
-				if (len == 0 && msgs[i].len != 1)
-					WR4(sc, TWI_CR, TWI_CR_STOP);
 				if ((err = at91_twi_wait(sc, TWI_SR_TXRDY)))
 					goto out;
 				WR4(sc, TWI_THR, *buf++);

==== //depot/projects/smpng/sys/boot/i386/boot2/Makefile#22 (text+ko) ====

@@ -1,11 +1,9 @@
-# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.64 2010/08/31 17:33:29 dim Exp $
+# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.65 2010/09/21 21:41:45 dim Exp $
 
 .include 
 
 # XXX: clang can compile the boot code just fine, but boot2 gets too big
-.if ${CC:T:Mclang} == "clang"
-CC=gcc
-.endif
+CC:=${CC:C/^(.*\/)?clang$/gcc/1}
 
 FILES=		boot boot1 boot2
 

==== //depot/projects/smpng/sys/boot/i386/gptboot/Makefile#3 (text+ko) ====

@@ -1,6 +1,6 @@
-# $FreeBSD: src/sys/boot/i386/gptboot/Makefile,v 1.63 2010/08/23 01:42:09 imp Exp $
+# $FreeBSD: src/sys/boot/i386/gptboot/Makefile,v 1.64 2010/09/24 19:49:12 pjd Exp $
 
-.PATH:		${.CURDIR}/../boot2
+.PATH:		${.CURDIR}/../boot2 ${.CURDIR}/../common ${.CURDIR}/../../common
 
 FILES=		gptboot
 
@@ -19,18 +19,21 @@
 #GPTBOOT_UFS?=	UFS2_ONLY
 #GPTBOOT_UFS?=	UFS1_ONLY
 
-CFLAGS=	-Os \
+CFLAGS=	-DBOOTPROG=\"gptboot\" \
+	-Os \
 	-fno-guess-branch-probability \
 	-fomit-frame-pointer \
 	-fno-unit-at-a-time \
 	-mno-align-long-strings \
 	-mrtd \
 	-mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 \
+	-DGPT \
 	-D${GPTBOOT_UFS} \
 	-DSIOPRT=${BOOT_COMCONSOLE_PORT} \
 	-DSIOFMT=${B2SIOFMT} \
 	-DSIOSPD=${BOOT_COMCONSOLE_SPEED} \
 	-I${.CURDIR}/../../common \
+	-I${.CURDIR}/../common \
 	-I${.CURDIR}/../btx/lib -I. \
 	-I${.CURDIR}/../boot2 \
 	-Wall -Waggregate-return -Wbad-function-cast -Wcast-align \
@@ -57,13 +60,13 @@
 gptldr.out: gptldr.o
 	${LD} ${LDFLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} gptldr.o
 
-CLEANFILES+=	gptboot.bin gptboot.out gptboot.o sio.o
+CLEANFILES+=	gptboot.bin gptboot.out gptboot.o sio.o ufsread.o
 
 gptboot.bin: gptboot.out
 	objcopy -S -O binary gptboot.out ${.TARGET}
 
-gptboot.out: ${BTXCRT} gptboot.o sio.o
-	${LD} ${LDFLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC}
+gptboot.out: ${BTXCRT} gptboot.o sio.o gpt.o crc32.o drv.o cons.o util.o
+	${LD} ${LDFLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBSTAND}
 
 gptboot.o: ${.CURDIR}/../../common/ufsread.c
 

==== //depot/projects/smpng/sys/boot/i386/gptboot/gptboot.c#7 (text+ko) ====

@@ -14,7 +14,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/boot/i386/gptboot/gptboot.c,v 1.91 2010/03/26 01:30:53 delphij Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/i386/gptboot/gptboot.c,v 1.92 2010/09/24 19:49:12 pjd Exp $");
 
 #include 
 #include 
@@ -32,47 +32,12 @@
 #include 
 
 #include "lib.h"
-
-#define IO_KEYBOARD	1
-#define IO_SERIAL	2
-
-#define SECOND		18	/* Circa that many ticks in a second. */
+#include "rbx.h"
+#include "drv.h"
+#include "util.h"
+#include "cons.h"
+#include "gpt.h"
 
-#define RBX_ASKNAME	0x0	/* -a */
-#define RBX_SINGLE	0x1	/* -s */
-/* 0x2 is reserved for log2(RB_NOSYNC). */
-/* 0x3 is reserved for log2(RB_HALT). */
-/* 0x4 is reserved for log2(RB_INITNAME). */
-#define RBX_DFLTROOT	0x5	/* -r */
-#define RBX_KDB 	0x6	/* -d */
-/* 0x7 is reserved for log2(RB_RDONLY). */
-/* 0x8 is reserved for log2(RB_DUMP). */
-/* 0x9 is reserved for log2(RB_MINIROOT). */
-#define RBX_CONFIG	0xa	/* -c */
-#define RBX_VERBOSE	0xb	/* -v */
-#define RBX_SERIAL	0xc	/* -h */
-#define RBX_CDROM	0xd	/* -C */
-/* 0xe is reserved for log2(RB_POWEROFF). */
-#define RBX_GDB 	0xf	/* -g */
-#define RBX_MUTE	0x10	/* -m */
-/* 0x11 is reserved for log2(RB_SELFTEST). */
-/* 0x12 is reserved for boot programs. */
-/* 0x13 is reserved for boot programs. */
-#define RBX_PAUSE	0x14	/* -p */
-#define RBX_QUIET	0x15	/* -q */
-#define RBX_NOINTR	0x1c	/* -n */
-/* 0x1d is reserved for log2(RB_MULTIPLE) and is just misnamed here. */
-#define RBX_DUAL	0x1d	/* -D */
-/* 0x1f is reserved for log2(RB_BOOTINFO). */
-
-/* pass: -a, -s, -r, -d, -c, -v, -h, -C, -g, -m, -p, -D */
-#define RBX_MASK	(OPT_SET(RBX_ASKNAME) | OPT_SET(RBX_SINGLE) | \
-			OPT_SET(RBX_DFLTROOT) | OPT_SET(RBX_KDB ) | \
-			OPT_SET(RBX_CONFIG) | OPT_SET(RBX_VERBOSE) | \
-			OPT_SET(RBX_SERIAL) | OPT_SET(RBX_CDROM) | \
-			OPT_SET(RBX_GDB ) | OPT_SET(RBX_MUTE) | \
-			OPT_SET(RBX_PAUSE) | OPT_SET(RBX_DUAL))
-
 #define PATH_CONFIG	"/boot.config"
 #define PATH_BOOT3	"/boot/loader"
 #define PATH_KERNEL	"/boot/kernel/kernel"
@@ -82,8 +47,6 @@
 #define NDEV		3
 #define MEM_BASE	0x12
 #define MEM_EXT 	0x15
-#define V86_CY(x)	((x) & PSL_C)
-#define V86_ZR(x)	((x) & PSL_Z)
 
 #define DRV_HARD	0x80
 #define DRV_MASK	0x7f
@@ -93,211 +56,178 @@
 #define TYPE_MAXHARD	TYPE_DA
 #define TYPE_FD		2
 
-#define OPT_SET(opt)	(1 << (opt))
-#define OPT_CHECK(opt)	((opts) & OPT_SET(opt))
-
 extern uint32_t _end;
 
 static const uuid_t freebsd_ufs_uuid = GPT_ENT_TYPE_FREEBSD_UFS;
 static const char optstr[NOPT] = "DhaCcdgmnpqrsv"; /* Also 'P', 'S' */
 static const unsigned char flags[NOPT] = {
-    RBX_DUAL,
-    RBX_SERIAL,
-    RBX_ASKNAME,
-    RBX_CDROM,
-    RBX_CONFIG,
-    RBX_KDB,
-    RBX_GDB,
-    RBX_MUTE,
-    RBX_NOINTR,
-    RBX_PAUSE,
-    RBX_QUIET,
-    RBX_DFLTROOT,
-    RBX_SINGLE,
-    RBX_VERBOSE
+	RBX_DUAL,
+	RBX_SERIAL,
+	RBX_ASKNAME,
+	RBX_CDROM,
+	RBX_CONFIG,
+	RBX_KDB,
+	RBX_GDB,
+	RBX_MUTE,
+	RBX_NOINTR,
+	RBX_PAUSE,
+	RBX_QUIET,
+	RBX_DFLTROOT,
+	RBX_SINGLE,
+	RBX_VERBOSE
 };
+uint32_t opts;
 
 static const char *const dev_nm[NDEV] = {"ad", "da", "fd"};
 static const unsigned char dev_maj[NDEV] = {30, 4, 2};
 
-static struct dsk {
-    unsigned drive;
-    unsigned type;
-    unsigned unit;
-    int part;
-    daddr_t start;
-    int init;
-} dsk;
-static char cmd[512], cmddup[512];
+static struct dsk dsk;
 static char kname[1024];
-static uint32_t opts;
 static int comspeed = SIOSPD;
 static struct bootinfo bootinfo;
-static uint8_t ioctrl = IO_KEYBOARD;
 
 void exit(int);
-static int bcmp(const void *, const void *, size_t);
 static void load(void);
-static int parse(void);
+static int parse(char *, int *);
 static int xfsread(ino_t, void *, size_t);
 static int dskread(void *, daddr_t, unsigned);
-static void printf(const char *,...);
-static void putchar(int);
-static void memcpy(void *, const void *, int);
 static uint32_t memsize(void);
-static int drvread(void *, daddr_t, unsigned);
-static int keyhit(unsigned);
-static int xputc(int);
-static int xgetc(int);
-static int getc(int);
 
-static void
-memcpy(void *dst, const void *src, int len)
-{
-    const char *s = src;
-    char *d = dst;
-
-    while (len--)
-        *d++ = *s++;
-}
-
-static inline int
-strcmp(const char *s1, const char *s2)
-{
-    for (; *s1 == *s2 && *s1; s1++, s2++);
-    return (unsigned char)*s1 - (unsigned char)*s2;
-}
-
 #include "ufsread.c"
 
 static inline int
 xfsread(ino_t inode, void *buf, size_t nbyte)
 {
-    if ((size_t)fsread(inode, buf, nbyte) != nbyte) {
-	printf("Invalid %s\n", "format");
-	return -1;
-    }
-    return 0;
+
+	if ((size_t)fsread(inode, buf, nbyte) != nbyte) {
+		printf("Invalid %s\n", "format");
+		return (-1);
+	}
+	return (0);
 }
 
 static inline uint32_t
 memsize(void)
 {
-    v86.addr = MEM_EXT;
-    v86.eax = 0x8800;
-    v86int();
-    return v86.eax;
+
+	v86.addr = MEM_EXT;
+	v86.eax = 0x8800;
+	v86int();
+	return (v86.eax);
 }
 
-static inline void
-getstr(void)
+static int
+gptinit(void)
 {
-    char *s;
-    int c;
 
-    s = cmd;
-    for (;;) {
-	switch (c = xgetc(0)) {
-	case 0:
-	    break;
-	case '\177':
-	case '\b':
-	    if (s > cmd) {
-		s--;
-		printf("\b \b");
-	    }
-	    break;
-	case '\n':
-	case '\r':
-	    *s = 0;
-	    return;
-	default:
-	    if (s - cmd < sizeof(cmd) - 1)
-		*s++ = c;
-	    putchar(c);
+	if (gptread(&freebsd_ufs_uuid, &dsk, dmadat->secbuf) == -1) {
+		printf("%s: unable to load GPT\n", BOOTPROG);
+		return (-1);
+	}
+	if (gptfind(&freebsd_ufs_uuid, &dsk, dsk.part) == -1) {
+		printf("%s: no UFS partition was found\n", BOOTPROG);
+		return (-1);
 	}
-    }
+	dsk_meta = 0;
+	return (0);
 }
 
-static inline void
-putc(int c)
-{
-    v86.addr = 0x10;
-    v86.eax = 0xe00 | (c & 0xff);
-    v86.ebx = 0x7;
-    v86int();
-}
-
 int
 main(void)
 {
-    int autoboot;
-    ino_t ino;
+	char cmd[512], cmdtmp[512];
+	int autoboot, dskupdated;
+	ino_t ino;
+
+	dmadat = (void *)(roundup2(__base + (int32_t)&_end, 0x10000) - __base);
+	v86.ctl = V86_FLAGS;
+	v86.efl = PSL_RESERVED_DEFAULT | PSL_I;
+	dsk.drive = *(uint8_t *)PTOV(ARGS);
+	dsk.type = dsk.drive & DRV_HARD ? TYPE_AD : TYPE_FD;
+	dsk.unit = dsk.drive & DRV_MASK;
+	dsk.part = -1;
+	dsk.start = 0;
+	bootinfo.bi_version = BOOTINFO_VERSION;
+	bootinfo.bi_size = sizeof(bootinfo);
+	bootinfo.bi_basemem = 0;	/* XXX will be filled by loader or kernel */
+	bootinfo.bi_extmem = memsize();
+	bootinfo.bi_memsizes_valid++;
 
-    dmadat = (void *)(roundup2(__base + (int32_t)&_end, 0x10000) - __base);
-    v86.ctl = V86_FLAGS;
-    v86.efl = PSL_RESERVED_DEFAULT | PSL_I;
-    dsk.drive = *(uint8_t *)PTOV(ARGS);
-    dsk.type = dsk.drive & DRV_HARD ? TYPE_AD : TYPE_FD;
-    dsk.unit = dsk.drive & DRV_MASK;
-    dsk.part = -1;
-    bootinfo.bi_version = BOOTINFO_VERSION;
-    bootinfo.bi_size = sizeof(bootinfo);
-    bootinfo.bi_basemem = 0;	/* XXX will be filled by loader or kernel */
-    bootinfo.bi_extmem = memsize();
-    bootinfo.bi_memsizes_valid++;
+	/* Process configuration file */
 
-    /* Process configuration file */
+	if (gptinit() != 0)
+		return (-1);
 
-    autoboot = 1;
+	autoboot = 1;
+	*cmd = '\0';
 
-    if ((ino = lookup(PATH_CONFIG)))
-	fsread(ino, cmd, sizeof(cmd));
+	for (;;) {
+		*kname = '\0';
+		ino = lookup(PATH_CONFIG);
+		if (ino > 0)
+			fsread(ino, cmd, sizeof(cmd));
 
-    if (*cmd) {
-	memcpy(cmddup, cmd, sizeof(cmd));
-	if (parse())
-	    autoboot = 0;
-	if (!OPT_CHECK(RBX_QUIET))
-	    printf("%s: %s", PATH_CONFIG, cmddup);
-	/* Do not process this command twice */
-	*cmd = 0;
-    }
+		if (*cmd != '\0') {
+			memcpy(cmdtmp, cmd, sizeof(cmdtmp));
+			if (parse(cmdtmp, &dskupdated))
+				break;
+			if (dskupdated && gptinit() != 0)
+				break;
+			if (!OPT_CHECK(RBX_QUIET))
+				printf("%s: %s", PATH_CONFIG, cmd);
+			*cmd = '\0';
+		}
 
-    /*
-     * Try to exec stage 3 boot loader. If interrupted by a keypress,
-     * or in case of failure, try to load a kernel directly instead.
-     */
+		if (autoboot && keyhit(3)) {
+			if (*kname == '\0')
+				memcpy(kname, PATH_BOOT3, sizeof(PATH_BOOT3));
+			break;
+		}
+		autoboot = 0;
 
-    if (autoboot && !*kname) {
-	memcpy(kname, PATH_BOOT3, sizeof(PATH_BOOT3));
-	if (!keyhit(3*SECOND)) {
-	    load();
-	    memcpy(kname, PATH_KERNEL, sizeof(PATH_KERNEL));
+		/*
+		 * Try to exec stage 3 boot loader. If interrupted by a
+		 * keypress, or in case of failure, try to load a kernel
+		 * directly instead.
+		 */
+		if (*kname != '\0')
+			load();
+		memcpy(kname, PATH_BOOT3, sizeof(PATH_BOOT3));
+		load();
+		memcpy(kname, PATH_KERNEL, sizeof(PATH_KERNEL));
+		load();
+		gptbootfailed(&dsk);
+		if (gptfind(&freebsd_ufs_uuid, &dsk, -1) == -1)
+			break;
+		dsk_meta = 0;
 	}
-    }
 
-    /* Present the user with the boot2 prompt. */
+	/* Present the user with the boot2 prompt. */
 
-    for (;;) {
-	if (!autoboot || !OPT_CHECK(RBX_QUIET))
-	    printf("\nFreeBSD/x86 boot\n"
-		   "Default: %u:%s(%up%u)%s\n"
-		   "boot: ",
-		   dsk.drive & DRV_MASK, dev_nm[dsk.type], dsk.unit,
-		   dsk.part, kname);
-	if (ioctrl & IO_SERIAL)
-	    sio_flush();
-	if (!autoboot || keyhit(5*SECOND))
-	    getstr();
-	else if (!autoboot || !OPT_CHECK(RBX_QUIET))
-	    putchar('\n');
-	autoboot = 0;
-	if (parse())
-	    putchar('\a');
-	else
-	    load();
-    }
+	for (;;) {
+		if (!OPT_CHECK(RBX_QUIET)) {
+			printf("\nFreeBSD/x86 boot\n"
+			    "Default: %u:%s(%up%u)%s\n"
+			    "boot: ",
+			    dsk.drive & DRV_MASK, dev_nm[dsk.type], dsk.unit,
+			    dsk.part, kname);
+		}
+		if (ioctrl & IO_SERIAL)
+			sio_flush();
+		*cmd = '\0';
+		if (keyhit(0))
+			getstr(cmd, sizeof(cmd));
+		else if (!OPT_CHECK(RBX_QUIET))
+			putchar('\n');
+		if (parse(cmd, &dskupdated)) {
+			putchar('\a');
+			continue;
+		}
+		if (dskupdated && gptinit() != 0)
+			continue;
+		load();
+	}
+	/* NOTREACHED */
 }
 
 /* XXX - Needed for btxld to link the boot2 binary; do not remove. */
@@ -321,8 +251,11 @@
     int fmt, i, j;
 
     if (!(ino = lookup(kname))) {
-	if (!ls)
-	    printf("No %s\n", kname);
+	if (!ls) {
+	    printf("%s: No %s on %u:%s(%up%u)\n", BOOTPROG,
+		kname, dsk.drive & DRV_MASK, dev_nm[dsk.type], dsk.unit,
+		dsk.part);
+	}
 	return;
     }
     if (xfsread(ino, &hdr, sizeof(hdr)))
@@ -402,14 +335,15 @@
 }
 
 static int
-parse(void)
+parse(char *cmdstr, int *dskupdated)
 {
-    char *arg = cmd;
+    char *arg = cmdstr;
     char *ep, *p, *q;
     const char *cp;
     unsigned int drv;
     int c, i, j;
 
+    *dskupdated = 0;
     while ((c = *arg++)) {
 	if (c == ' ' || c == '\t' || c == '\n')
 	    continue;
@@ -480,7 +414,7 @@
 		    drv = dsk.unit;
 		dsk.drive = (dsk.type <= TYPE_MAXHARD
 			     ? DRV_HARD : 0) + drv;
-		dsk_meta = 0;
+		*dskupdated = 1;
 	    }
 	    if ((i = ep - arg)) {
 		if ((size_t)i >= sizeof(kname))
@@ -496,232 +430,6 @@
 static int
 dskread(void *buf, daddr_t lba, unsigned nblk)
 {
-    struct gpt_hdr hdr;
-    struct gpt_ent *ent;
-    char *sec;
-    daddr_t slba, elba;
-    int part, entries_per_sec;
 
-    if (!dsk_meta) {
-	/* Read and verify GPT. */
-	sec = dmadat->secbuf;
-	dsk.start = 0;
-	if (drvread(sec, 1, 1))
-	    return -1;
-	memcpy(&hdr, sec, sizeof(hdr));
-	if (bcmp(hdr.hdr_sig, GPT_HDR_SIG, sizeof(hdr.hdr_sig)) != 0 ||
-	    hdr.hdr_lba_self != 1 || hdr.hdr_revision < 0x00010000 ||
-	    hdr.hdr_entsz < sizeof(*ent) || DEV_BSIZE % hdr.hdr_entsz != 0) {
-	    printf("Invalid GPT header\n");
-	    return -1;
-	}
-
-	/* XXX: CRC check? */
-
-	/*
-	 * If the partition isn't specified, then search for the first UFS
-	 * partition and hope it is /.  Perhaps we should be using an OS
-	 * flag in the GPT entry to mark / partitions.
-	 *
-	 * If the partition is specified, then figure out the LBA for the
-	 * sector containing that partition index and load it.
-	 */
-	entries_per_sec = DEV_BSIZE / hdr.hdr_entsz;
-	if (dsk.part == -1) {
-	    slba = hdr.hdr_lba_table;
-	    elba = slba + hdr.hdr_entries / entries_per_sec;
-	    while (slba < elba && dsk.part == -1) {
-		if (drvread(sec, slba, 1))
-		    return -1;
-		for (part = 0; part < entries_per_sec; part++) {
-		    ent = (struct gpt_ent *)(sec + part * hdr.hdr_entsz);
-		    if (bcmp(&ent->ent_type, &freebsd_ufs_uuid,
-			sizeof(uuid_t)) == 0) {
-			dsk.part = (slba - hdr.hdr_lba_table) *
-			    entries_per_sec + part + 1;
-			dsk.start = ent->ent_lba_start;
-			break;
-		    }
-		}
-		slba++;
-	    }
-	    if (dsk.part == -1) {
-		printf("No UFS partition was found\n");
-		return -1;
-	    }
-	} else {
-	    if (dsk.part > hdr.hdr_entries) {
-		printf("Invalid partition index\n");
-		return -1;
-	    }
-	    slba = hdr.hdr_lba_table + (dsk.part - 1) / entries_per_sec;
-	    if (drvread(sec, slba, 1))
-		return -1;
-	    part = (dsk.part - 1) % entries_per_sec;
-	    ent = (struct gpt_ent *)(sec + part * hdr.hdr_entsz);
-	    if (bcmp(&ent->ent_type, &freebsd_ufs_uuid, sizeof(uuid_t)) != 0) {
-		printf("Specified partition is not UFS\n");
-		return -1;
-	    }
-	    dsk.start = ent->ent_lba_start;
-	}
-	/*
-	 * XXX: No way to detect SCSI vs. ATA currently.
-	 */
-#if 0
-	if (!dsk.init) {
-	    if (d->d_type == DTYPE_SCSI)
-		dsk.type = TYPE_DA;
-	    dsk.init++;
-	}
-#endif
-    }
-    return drvread(buf, dsk.start + lba, nblk);
-}
-
-static void
-printf(const char *fmt,...)
-{
-    va_list ap;
-    char buf[10];
-    char *s;
-    unsigned u;
-    int c;
-
-    va_start(ap, fmt);
-    while ((c = *fmt++)) {
-	if (c == '%') {
-	    c = *fmt++;
-	    switch (c) {
-	    case 'c':
-		putchar(va_arg(ap, int));
-		continue;
-	    case 's':
-		for (s = va_arg(ap, char *); *s; s++)
-		    putchar(*s);
-		continue;
-	    case 'u':
-		u = va_arg(ap, unsigned);
-		s = buf;
-		do
-		    *s++ = '0' + u % 10U;
-		while (u /= 10U);
-		while (--s >= buf)
-		    putchar(*s);
-		continue;
-	    }
-	}
-	putchar(c);
-    }
-    va_end(ap);
-    return;
-}
-
-static void
-putchar(int c)
-{
-    if (c == '\n')
-	xputc('\r');
-    xputc(c);
-}
-
-static int
-bcmp(const void *b1, const void *b2, size_t length)
-{
-    const char *p1 = b1, *p2 = b2;
-
-    if (length == 0)
-	return (0);
-    do {
-	if (*p1++ != *p2++)
-	    break;
-    } while (--length);
-    return (length);
-}
-
-static struct {
-	uint16_t len;
-	uint16_t count;
-	uint16_t off;
-	uint16_t seg;
-	uint64_t lba;
-} packet;
-
-static int
-drvread(void *buf, daddr_t lba, unsigned nblk)
-{
-    static unsigned c = 0x2d5c7c2f;
-
-    if (!OPT_CHECK(RBX_QUIET))
-	printf("%c\b", c = c << 8 | c >> 24);
-    packet.len = 0x10;
-    packet.count = nblk;
-    packet.off = VTOPOFF(buf);
-    packet.seg = VTOPSEG(buf);
-    packet.lba = lba;
-    v86.ctl = V86_FLAGS;
-    v86.addr = 0x13;
-    v86.eax = 0x4200;
-    v86.edx = dsk.drive;
-    v86.ds = VTOPSEG(&packet);
-    v86.esi = VTOPOFF(&packet);
-    v86int();
-    if (V86_CY(v86.efl)) {
-	printf("error %u lba %u\n", v86.eax >> 8 & 0xff, lba);
-	return -1;
-    }
-    return 0;
-}
-
-static int
-keyhit(unsigned ticks)
-{
-    uint32_t t0, t1;
-
-    if (OPT_CHECK(RBX_NOINTR))
-	return 0;
-    t0 = 0;
-    for (;;) {
-	if (xgetc(1))
-	    return 1;
-	t1 = *(uint32_t *)PTOV(0x46c);
-	if (!t0)
-	    t0 = t1;
-	if (t1 < t0 || t1 >= t0 + ticks)
-	    return 0;
-    }
-}
-
-static int
-xputc(int c)
-{
-    if (ioctrl & IO_KEYBOARD)
-	putc(c);
-    if (ioctrl & IO_SERIAL)
-	sio_putc(c);
-    return c;
-}
-
-static int
-xgetc(int fn)
-{
-    if (OPT_CHECK(RBX_NOINTR))
-	return 0;
-    for (;;) {
-	if (ioctrl & IO_KEYBOARD && getc(1))
-	    return fn ? 1 : getc(0);
-	if (ioctrl & IO_SERIAL && sio_ischar())
-	    return fn ? 1 : sio_getc();
-	if (fn)
-	    return 0;
-    }
-}
-
-static int
-getc(int fn)
-{
-    v86.addr = 0x16;
-    v86.eax = fn << 8;
-    v86int();
-    return fn == 0 ? v86.eax & 0xff : !V86_ZR(v86.efl);
+	return drvread(&dsk, buf, lba + dsk.start, nblk);
 }

==== //depot/projects/smpng/sys/boot/i386/gptzfsboot/Makefile#4 (text+ko) ====

@@ -1,6 +1,8 @@
-# $FreeBSD: src/sys/boot/i386/gptzfsboot/Makefile,v 1.4 2010/08/23 01:42:09 imp Exp $
+# $FreeBSD: src/sys/boot/i386/gptzfsboot/Makefile,v 1.5 2010/09/24 19:49:12 pjd Exp $
 
-.PATH:		${.CURDIR}/../boot2 ${.CURDIR}/../gptboot ${.CURDIR}/../zfsboot
+.PATH:		${.CURDIR}/../boot2 ${.CURDIR}/../gptboot \
+		${.CURDIR}/../zfsboot ${.CURDIR}/../common \
+		${.CURDIR}/../../common
 
 FILES=		gptzfsboot
 
@@ -14,7 +16,8 @@
 ORG1=	0x7c00
 ORG2=	0x0
 
-CFLAGS=	-Os \
+CFLAGS=	-DBOOTPROG=\"gptzfsboot\" \
+	-Os \
 	-fno-guess-branch-probability \
 	-fomit-frame-pointer \
 	-fno-unit-at-a-time \
@@ -26,6 +29,7 @@
 	-DSIOFMT=${B2SIOFMT} \
 	-DSIOSPD=${BOOT_COMCONSOLE_SPEED} \
 	-I${.CURDIR}/../../common \
+	-I${.CURDIR}/../common \
 	-I${.CURDIR}/../../zfs \
 	-I${.CURDIR}/../../../cddl/boot/zfs \
 	-I${.CURDIR}/../btx/lib -I. \
@@ -59,7 +63,7 @@
 gptzfsboot.bin: gptzfsboot.out
 	objcopy -S -O binary gptzfsboot.out ${.TARGET}
 
-gptzfsboot.out: ${BTXCRT} zfsboot.o sio.o
+gptzfsboot.out: ${BTXCRT} zfsboot.o sio.o gpt.o drv.o cons.o util.o

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

From owner-p4-projects@FreeBSD.ORG  Mon Sep 27 20:10:08 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6D7831065670; Mon, 27 Sep 2010 20:10:07 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1B2A5106564A
	for ; Mon, 27 Sep 2010 20:10:07 +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 08B548FC0A
	for ; Mon, 27 Sep 2010 20:10:07 +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 o8RKA6Bo036487
	for ; Mon, 27 Sep 2010 20:10:06 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o8RKA6NZ036484
	for perforce@freebsd.org; Mon, 27 Sep 2010 20:10:06 GMT
	(envelope-from jhb@freebsd.org)
Date: Mon, 27 Sep 2010 20:10:06 GMT
Message-Id: <201009272010.o8RKA6NZ036484@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 184245 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: Mon, 27 Sep 2010 20:10:08 -0000

http://p4web.freebsd.org/@@184245?ac=10

Change 184245 by jhb@jhb_jhbbsd on 2010/09/27 20:09:12

	Possible fix for early memory corruption in the VM86 code reported
	by bde@.

Affected files ...

.. //depot/projects/smpng/sys/i386/i386/vm86.c#24 edit
.. //depot/projects/smpng/sys/i386/include/pmap.h#51 edit

Differences ...

==== //depot/projects/smpng/sys/i386/i386/vm86.c#24 (text+ko) ====

@@ -592,7 +592,7 @@
 
 	mtx_lock(&vm86_lock);
 	for (i = 0; i < vmc->npages; i++) {
-		page = vtophys(vmc->pmap[i].kva & PG_FRAME);
+		page = pmap_kextract_early(vmc->pmap[i].kva & PG_FRAME);
 		entry = vmc->pmap[i].pte_num; 
 		vmc->pmap[i].old_pte = pte[entry];
 		pte[entry] = page | PG_V | PG_RW | PG_U;

==== //depot/projects/smpng/sys/i386/include/pmap.h#51 (text+ko) ====

@@ -302,6 +302,29 @@
 	return (pa);
 }
 
+/*
+ * A version of pmap_kextract() that is safe to call before
+ * pmap_bootstrap().  This is used in vm86_datacall().  If
+ * pmap_bootstrap() has not been called, then KPTmap is not yet
+ * initialized, so fall back to using vtopte() instead.
+ */
+static __inline vm_paddr_t
+pmap_kextract_early(vm_offset_t va)
+{
+	vm_paddr_t pa;
+
+	if ((pa = PTD[va >> PDRSHIFT]) & PG_PS) {
+		pa = (pa & PG_PS_FRAME) | (va & PDRMASK);
+	} else {
+		if (KPTmap == NULL)
+			pa = *vtopte(va);
+		else
+			pa = KPTmap[i386_btop(va)];
+		pa = (pa & PG_FRAME) | (va & PAGE_MASK);
+	}
+	return (pa);
+}
+
 #define PT_UPDATES_FLUSH()
 #endif
 

From owner-p4-projects@FreeBSD.ORG  Thu Sep 30 16:25:40 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 65C9C1065697; Thu, 30 Sep 2010 16:25:40 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 27E241065675
	for ; Thu, 30 Sep 2010 16:25:40 +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 F0BB38FC13
	for ; Thu, 30 Sep 2010 16:25:39 +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 o8UGPd38022749
	for ; Thu, 30 Sep 2010 16:25:39 GMT
	(envelope-from lz@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o8UGPdLk022746
	for perforce@freebsd.org; Thu, 30 Sep 2010 16:25:39 GMT
	(envelope-from lz@FreeBSD.org)
Date: Thu, 30 Sep 2010 16:25:39 GMT
Message-Id: <201009301625.o8UGPdLk022746@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 184318 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: Thu, 30 Sep 2010 16:25:40 -0000

http://p4web.freebsd.org/@@184318?ac=10

Change 184318 by lz@freebsd-current on 2010/09/30 16:25:39

	Fix a include file path.

Affected files ...

.. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_vnops.c#3 edit

Differences ...

==== //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_vnops.c#3 (text+ko) ====

@@ -161,7 +161,7 @@
 	.vop_vptofh =		ext2_vptofh,
 };
 
-#include 
+#include 
 
 /*
  * A virgin directory (no blushing please).

From owner-p4-projects@FreeBSD.ORG  Fri Oct  1 12:54:19 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C1A671065672; Fri,  1 Oct 2010 12:54:19 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6B530106566C
	for ; Fri,  1 Oct 2010 12:54:19 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 57CC08FC18
	for ; Fri,  1 Oct 2010 12:54:19 +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 o91CsJD0078087
	for ; Fri, 1 Oct 2010 12:54:19 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o91CsJUG078084
	for perforce@freebsd.org; Fri, 1 Oct 2010 12:54:19 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Fri, 1 Oct 2010 12:54:19 GMT
Message-Id: <201010011254.o91CsJUG078084@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 184337 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: Fri, 01 Oct 2010 12:54:20 -0000

http://p4web.freebsd.org/@@184337?ac=10

Change 184337 by hselasky@hselasky_laptop001 on 2010/10/01 12:53:46

	USB controller:
		- XHCI style changes (no functional changes)
		- the definition of the WLENGTH mask was corrected
		- requested by Andrew Thompson

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/controller/xhci.c#32 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/xhci.h#23 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/controller/xhci.c#32 (text+ko) ====

@@ -98,36 +98,41 @@
 #define	XHCI_INTR_ENDPT 1
 
 struct xhci_std_temp {
-	struct xhci_softc *sc;
-	struct usb_page_cache *pc;
-	struct xhci_td *td;
-	struct xhci_td *td_next;
-	uint32_t len;
-	uint32_t offset;
-	uint32_t max_packet_size;
-	uint32_t average;
-	uint16_t isoc_delta;
-	uint16_t isoc_frame;
-	uint8_t	shortpkt;
-	uint8_t multishort;
-	uint8_t last_frame;
-	uint8_t trb_type;
-	uint8_t direction;
-	uint8_t tbc;
-	uint8_t tlbpc;
-	uint8_t step_td;
+	struct xhci_softc	*sc;
+	struct usb_page_cache	*pc;
+	struct xhci_td		*td;
+	struct xhci_td		*td_next;
+	uint32_t		len;
+	uint32_t		offset;
+	uint32_t		max_packet_size;
+	uint32_t		average;
+	uint16_t		isoc_delta;
+	uint16_t		isoc_frame;
+	uint8_t			shortpkt;
+	uint8_t			multishort;
+	uint8_t			last_frame;
+	uint8_t			trb_type;
+	uint8_t			direction;
+	uint8_t			tbc;
+	uint8_t			tlbpc;
+	uint8_t			step_td;
 };
 
-static void xhci_do_poll(struct usb_bus *);
-static void xhci_device_done(struct usb_xfer *, usb_error_t);
-static void xhci_root_intr(struct xhci_softc *);
-static void xhci_free_device_ext(struct usb_device *udev);
-static struct xhci_endpoint_ext *xhci_get_endpoint_ext(struct usb_device *, struct usb_endpoint_descriptor *);
+static void	xhci_do_poll(struct usb_bus *);
+static void	xhci_device_done(struct usb_xfer *, usb_error_t);
+static void	xhci_root_intr(struct xhci_softc *);
+static void	xhci_free_device_ext(struct usb_device *);
+static struct xhci_endpoint_ext *xhci_get_endpoint_ext(struct usb_device *,
+		    struct usb_endpoint_descriptor *);
 static usb_proc_callback_t xhci_configure_msg;
 static usb_error_t xhci_configure_device(struct usb_device *);
-static usb_error_t xhci_configure_endpoint(struct usb_device *, struct usb_endpoint_descriptor *, uint64_t, uint16_t, uint8_t, uint8_t, uint8_t, uint16_t, uint16_t);
-static usb_error_t xhci_configure_mask(struct usb_device *, uint32_t, uint8_t);
-static usb_error_t xhci_cmd_evaluate_ctx(struct xhci_softc *, uint64_t, uint8_t);
+static usb_error_t xhci_configure_endpoint(struct usb_device *,
+		    struct usb_endpoint_descriptor *, uint64_t, uint16_t,
+		    uint8_t, uint8_t, uint8_t, uint16_t, uint16_t);
+static usb_error_t xhci_configure_mask(struct usb_device *,
+		    uint32_t, uint8_t);
+static usb_error_t xhci_cmd_evaluate_ctx(struct xhci_softc *,
+		    uint64_t, uint8_t);
 static void xhci_endpoint_doorbell(struct usb_xfer *);
 
 extern struct usb_bus_methods xhci_bus_methods;
@@ -217,7 +222,8 @@
 	DPRINTF("HCS0 = 0x%08x\n", temp);
 
 	if (XHCI_HCS0_CSZ(temp)) {
-		device_printf(sc->sc_bus.parent, "Driver does not support 64-byte contexts.");
+		device_printf(sc->sc_bus.parent, "Driver does not "
+		    "support 64-byte contexts.");
 		return (USB_ERR_IOERROR);
 	}
 
@@ -226,13 +232,15 @@
 
 	for (i = 0; i != 100; i++) {
 		usb_pause_mtx(NULL, hz / 1000);
-		temp = XREAD4(sc, oper, XHCI_USBCMD) & (XHCI_CMD_HCRST | XHCI_STS_CNR);
+		temp = XREAD4(sc, oper, XHCI_USBCMD) &
+		    (XHCI_CMD_HCRST | XHCI_STS_CNR);
 		if (!temp)
 			break;
 	}
 
 	if (temp) {
-		device_printf(sc->sc_bus.parent, "Controller reset timeout.\n");
+		device_printf(sc->sc_bus.parent, "Controller "
+		    "reset timeout.\n");
 		return (USB_ERR_IOERROR);
 	}
 
@@ -288,16 +296,12 @@
 
 	/* clear interrupts */
 	XWRITE4(sc, oper, XHCI_USBSTS, temp);
-
 	/* disable all device notifications */
 	XWRITE4(sc, oper, XHCI_DNCTRL, 0);
 
 	/* setup device context base address */
-
 	usbd_get_page(&sc->sc_hw.ctx_pc, 0, &buf_res);
-
 	pdctxa = buf_res.buffer;
-
 	memset(pdctxa, 0, sizeof(*pdctxa));
 
 	addr = buf_res.physaddr;
@@ -307,11 +311,8 @@
 	pdctxa->qwBaaDevCtxAddr[0] = htole64(addr);
 
 	for (i = 0; i != sc->sc_noscratch; i++) {
-
 		struct usb_page_search buf_scp;
-
 		usbd_get_page(&sc->sc_hw.scratch_pc[i], 0, &buf_scp);
-
 		pdctxa->qwSpBufPtr[i] = htole64((uint64_t)buf_scp.physaddr);
 	}
 
@@ -319,7 +320,6 @@
 
 	XWRITE4(sc, oper, XHCI_DCBAAP_LO, (uint32_t)addr);
 	XWRITE4(sc, oper, XHCI_DCBAAP_HI, (uint32_t)(addr >> 32));
-
 	XWRITE4(sc, oper, XHCI_DCBAAP_LO, (uint32_t)addr);
 	XWRITE4(sc, oper, XHCI_DCBAAP_HI, (uint32_t)(addr >> 32));
 
@@ -342,7 +342,6 @@
 	XWRITE4(sc, runt, XHCI_ERSTSZ(0), XHCI_ERSTS_SET(temp));
 
 	/* Setup interrupt rate */
-
 	XWRITE4(sc, runt, XHCI_IMOD(0), XHCI_IMOD_DEFAULT);
 
 	usbd_get_page(&sc->sc_hw.root_pc, 0, &buf_res);
@@ -352,7 +351,6 @@
 	addr += (uintptr_t)&((struct xhci_hw_root *)0)->hwr_events[0];
 
 	/* reset hardware root structure */
-
 	memset(phwr, 0, sizeof(*phwr));
 
 	phwr->hwr_ring_seg[0].qwEvrsTablePtr = htole64(addr);
@@ -377,7 +375,6 @@
 	XWRITE4(sc, runt, XHCI_IMAN(0), temp);
 
 	/* setup command ring control base address */
-
 	addr = buf_res.physaddr;
 	addr += (uintptr_t)&((struct xhci_hw_root *)0)->hwr_commands[0];
 
@@ -557,8 +554,8 @@
 			break;
 		}
 		/* Check for transfer error */
-		if ((status != XHCI_TRB_ERROR_SHORT_PKT) &&
-		    (status != XHCI_TRB_ERROR_SUCCESS)) {
+		if (status != XHCI_TRB_ERROR_SHORT_PKT &&
+		    status != XHCI_TRB_ERROR_SUCCESS) {
 			/* the transfer is finished */
 			td = NULL;
 			break;
@@ -589,8 +586,8 @@
 	xfer->td_transfer_cache = td;
 
 	return ((status == XHCI_TRB_ERROR_STALL) ? USB_ERR_STALLED : 
-	    ((status != XHCI_TRB_ERROR_SHORT_PKT) && 
-	    (status != XHCI_TRB_ERROR_SUCCESS)) ? USB_ERR_IOERROR :
+	    (status != XHCI_TRB_ERROR_SHORT_PKT && 
+	    status != XHCI_TRB_ERROR_SUCCESS) ? USB_ERR_IOERROR :
 	    USB_ERR_NORMAL_COMPLETION);
 }
 
@@ -712,8 +709,8 @@
 	index = XHCI_TRB_3_SLOT_GET(temp);
 
 	/* check if error means halted */
-	halted = (status != XHCI_TRB_ERROR_SHORT_PKT) &&
-	    (status != XHCI_TRB_ERROR_SUCCESS);
+	halted = (status != XHCI_TRB_ERROR_SHORT_PKT &&
+	    status != XHCI_TRB_ERROR_SUCCESS);
 
 	DPRINTF("slot=%u epno=%u remainder=%u status=%u\n",
 	    index, epno, remainder, status);
@@ -759,8 +756,8 @@
 
 		offset = td_event - td->td_self;
 
-		if ((offset >= 0) &&
-		    (offset < sizeof(td->td_trb))) {
+		if (offset >= 0 &&
+		    offset < sizeof(td->td_trb)) {
 
 			usb_pc_cpu_invalidate(td->page_cache);
 
@@ -1165,7 +1162,6 @@
 		}
 
 		/* configure input endpoint context structure */
-
 		switch (udev->speed) {
 		case USB_SPEED_LOW:
 		case USB_SPEED_FULL:
@@ -1526,7 +1522,8 @@
 			td->td_trb[0].qwTrb0 = 0;
 
 			usbd_copy_out(temp->pc, temp->offset + buf_offset, 
-			   (uint8_t *)(uintptr_t)&td->td_trb[0].qwTrb0, average);
+			   (uint8_t *)(uintptr_t)&td->td_trb[0].qwTrb0,
+			   average);
 
 			dword = XHCI_TRB_2_BYTES_SET(8) |
 			    XHCI_TRB_2_TDSZ_SET(0) |
@@ -1538,7 +1535,8 @@
 			  XHCI_TRB_3_IDT_BIT | XHCI_TRB_3_CYCLE_BIT;
 
 			/* check wLength */
-			if (td->td_trb[0].qwTrb0 & htole64(0xFFFF00000000ULL)) {
+			if (td->td_trb[0].qwTrb0 &
+			   htole64(XHCI_TRB_0_WLENGTH_MASK)) {
 				if (td->td_trb[0].qwTrb0 & htole64(1))
 					dword |= XHCI_TRB_3_TRT_IN;
 				else
@@ -1606,8 +1604,10 @@
 				 * can be sent using the wrong data
 				 * toggle value.
 				 */
-				if ((temp->trb_type != XHCI_TRB_TYPE_SETUP_STAGE) &&
-				    (temp->trb_type != XHCI_TRB_TYPE_STATUS_STAGE))
+				if (temp->trb_type !=
+				    XHCI_TRB_TYPE_SETUP_STAGE &&
+				    temp->trb_type !=
+				    XHCI_TRB_TYPE_STATUS_STAGE)
 					dword |= XHCI_TRB_3_ISP_BIT;
 			}
 
@@ -1838,7 +1838,7 @@
 
 		temp.len = xfer->frlengths[x];
 		temp.step_td = ((xfer->endpointno & UE_DIR_IN) &&
-		    (x != 0) && (temp.multishort == 0));
+		    x != 0 && temp.multishort == 0);
 
 		x++;
 
@@ -1963,7 +1963,7 @@
 	pinp = buf_inp.buffer;
 
 	if (drop) {
-		mask &= 0xFFFFFFFC;
+		mask &= XHCI_INCTX_NON_CTRL_MASK;
 		pinp->ctx_input.dwInCtx0 = htole32(mask);
 		pinp->ctx_input.dwInCtx1 = 0;
 	} else {
@@ -2091,7 +2091,8 @@
 	case UE_INTERRUPT:
 	case UE_ISOCHRONOUS:
 		temp = XHCI_EPCTX_4_MAX_ESIT_PAYLOAD_SET(max_frame_size) |
-		    XHCI_EPCTX_4_AVG_TRB_LEN_SET(MIN(XHCI_PAGE_SIZE, max_frame_size));
+		    XHCI_EPCTX_4_AVG_TRB_LEN_SET(MIN(XHCI_PAGE_SIZE,
+		    max_frame_size));
 		break;
 	case UE_CONTROL:
 		temp = XHCI_EPCTX_4_AVG_TRB_LEN_SET(8);
@@ -2217,9 +2218,9 @@
 		break;
 	}
 
-	is_hub = (sc->sc_hw.devs[index].nports != 0) &&
-	    ((udev->speed == USB_SPEED_SUPER) ||
-	    (udev->speed == USB_SPEED_HIGH));
+	is_hub = sc->sc_hw.devs[index].nports != 0 &&
+	    (udev->speed == USB_SPEED_SUPER ||
+	    udev->speed == USB_SPEED_HIGH);
 
 	if (is_hub) {
 		temp |= XHCI_SCTX_0_HUB_SET(1);
@@ -2235,8 +2236,10 @@
 
 	temp = XHCI_SCTX_1_RH_PORT_SET(rh_port);
 
-	if (is_hub)
-		temp |= XHCI_SCTX_1_NUM_PORTS_SET(sc->sc_hw.devs[index].nports);
+	if (is_hub) {
+		temp |= XHCI_SCTX_1_NUM_PORTS_SET(
+		    sc->sc_hw.devs[index].nports);
+	}
 
 	switch (udev->speed) {
 	case USB_SPEED_SUPER:
@@ -2375,24 +2378,14 @@
 xhci_free_device_ext(struct usb_device *udev)
 {
 	struct xhci_softc *sc = XHCI_BUS2SC(udev->bus);
-	struct usb_page_cache *pc;
 	uint8_t index;
 
 	index = udev->controller_slot_id;
-
 	xhci_set_slot_pointer(sc, index, 0);
 
-	pc = &sc->sc_hw.devs[index].device_pc;
-
-	usb_pc_free_mem(pc);
-
-	pc = &sc->sc_hw.devs[index].input_pc;
-
-	usb_pc_free_mem(pc);
-
-	pc = &sc->sc_hw.devs[index].endpoint_pc;
-
-	usb_pc_free_mem(pc);
+	usb_pc_free_mem(&sc->sc_hw.devs[index].device_pc);
+	usb_pc_free_mem(&sc->sc_hw.devs[index].input_pc);
+	usb_pc_free_mem(&sc->sc_hw.devs[index].endpoint_pc);
 }
 
 static struct xhci_endpoint_ext *
@@ -2458,7 +2451,7 @@
 
 		pepext->xfer[xfer->qh_pos] = NULL;
 
-		if (error && (pepext->trb_running != 0)) {
+		if (error && pepext->trb_running != 0) {
 			pepext->trb_halted = 1;
 			pepext->trb_running = 0;
 		}
@@ -2963,7 +2956,7 @@
 		}
 		break;
 	case C(UR_SET_CONFIG, UT_WRITE_DEVICE):
-		if ((value != 0) && (value != 1)) {
+		if (value != 0 && value != 1) {
 			err = USB_ERR_IOERROR;
 			goto done;
 		}

==== //depot/projects/usb/src/sys/dev/usb/controller/xhci.h#23 (text+ko) ====

@@ -57,7 +57,8 @@
 	volatile uint64_t	qwSpBufPtr[XHCI_MAX_SCRATCHPADS];
 };
 
-#define	XHCI_EPNO2EPID(x) ((((x) & UE_DIR_IN) ? 1 : 0) | (2 * ((x) & UE_ADDR)))
+#define	XHCI_EPNO2EPID(x) \
+    ((((x) & UE_DIR_IN) ? 1 : 0) | (2 * ((x) & UE_ADDR)))
 
 struct xhci_slot_ctx {
 	volatile uint32_t	dwSctx0;
@@ -136,6 +137,7 @@
 };
 
 struct xhci_input_ctx {
+#define	XHCI_INCTX_NON_CTRL_MASK	0xFFFFFFFCU
 	volatile uint32_t	dwInCtx0;
 #define	XHCI_INCTX_0_DROP_MASK(n)	(1U << (n))
 	volatile uint32_t	dwInCtx1;
@@ -180,6 +182,7 @@
 
 struct xhci_trb {
 	volatile uint64_t	qwTrb0;
+#define	XHCI_TRB_0_WLENGTH_MASK		(0xFFFFULL << 48)
 	volatile uint32_t	dwTrb2;
 #define	XHCI_TRB_2_ERROR_GET(x)		(((x) >> 24) & 0xFF)
 #define	XHCI_TRB_2_ERROR_SET(x)		(((x) & 0xFF) << 24)
@@ -299,10 +302,10 @@
 #define	XHCI_TRB_ERROR_INVALID_SID	0x22
 #define	XHCI_TRB_ERROR_SEC_BW		0x23
 #define	XHCI_TRB_ERROR_SPLIT_XACT	0x24
-};
+} __aligned(4);
 
 struct xhci_dev_endpoint_trbs {
-	struct xhci_trb trb[XHCI_MAX_ENDPOINTS][XHCI_MAX_TRANSFERS];
+	struct xhci_trb		trb[XHCI_MAX_ENDPOINTS][XHCI_MAX_TRANSFERS];
 };
 
 #define	XHCI_TD_PAGE_NBUF	17	/* units, room enough for 64Kbytes */
@@ -310,25 +313,24 @@
 #define	XHCI_TD_PAYLOAD_MAX	(XHCI_TD_PAGE_SIZE * (XHCI_TD_PAGE_NBUF - 1))
 
 struct xhci_td {
-	struct xhci_trb	td_trb[XHCI_TD_PAGE_NBUF + 1];
+	struct xhci_trb		td_trb[XHCI_TD_PAGE_NBUF + 1];
 
 /*
  * Extra information needed:
  */
-	uint64_t td_self;
-	struct xhci_td *next;
-	struct xhci_td *alt_next;
-	struct xhci_td *obj_next;
-	struct usb_page_cache *page_cache;
-	uint32_t len;
-	uint32_t remainder;
-	uint8_t ntrb;
-	uint8_t status;
-
+	uint64_t		td_self;
+	struct xhci_td		*next;
+	struct xhci_td		*alt_next;
+	struct xhci_td		*obj_next;
+	struct usb_page_cache	*page_cache;
+	uint32_t		len;
+	uint32_t		remainder;
+	uint8_t			ntrb;
+	uint8_t			status;
 } __aligned(XHCI_TRB_ALIGN);
 
 struct xhci_command {
-	struct xhci_trb trb;
+	struct xhci_trb		trb;
 	TAILQ_ENTRY(xhci_command) entry;
 };
 
@@ -342,20 +344,20 @@
 	struct xhci_event_ring_seg	hwr_ring_seg[XHCI_MAX_RSEG];
 	struct {
 		volatile uint64_t dummy;
-	} __aligned(64) padding;
+	} __aligned(64)			padding;
 	struct xhci_trb			hwr_events[XHCI_MAX_EVENTS];
 	struct xhci_trb			hwr_commands[XHCI_MAX_COMMANDS];
 };
 
 struct xhci_endpoint_ext {
-	struct xhci_trb *trb;
-	struct usb_xfer *xfer[XHCI_MAX_TRANSFERS - 1];
-	struct usb_page_cache *page_cache;
-	uint64_t physaddr;
-	uint8_t trb_used;
-	uint8_t trb_index;
-	uint8_t trb_halted;
-	uint8_t trb_running;
+	struct xhci_trb		*trb;
+	struct usb_xfer		*xfer[XHCI_MAX_TRANSFERS - 1];
+	struct usb_page_cache	*page_cache;
+	uint64_t		physaddr;
+	uint8_t			trb_used;
+	uint8_t			trb_index;
+	uint8_t			trb_halted;
+	uint8_t			trb_running;
 };
 
 enum {
@@ -368,101 +370,113 @@
 };
 
 struct xhci_hw_dev {
-	struct usb_page_cache device_pc;
-	struct usb_page_cache input_pc;
-	struct usb_page_cache endpoint_pc;
+	struct usb_page_cache	device_pc;
+	struct usb_page_cache	input_pc;
+	struct usb_page_cache	endpoint_pc;
 
-	struct usb_page device_pg;
-	struct usb_page input_pg;
-	struct usb_page endpoint_pg;
+	struct usb_page		device_pg;
+	struct usb_page		input_pg;
+	struct usb_page		endpoint_pg;
 
 	struct xhci_endpoint_ext endp[XHCI_MAX_ENDPOINTS];
 
-	uint8_t state;
-	uint8_t nports;
-	uint8_t tt;
-	uint8_t reserved;
+	uint8_t			state;
+	uint8_t			nports;
+	uint8_t			tt;
+	uint8_t			reserved;
 };
 
 struct xhci_hw_softc {
-	struct usb_page_cache root_pc;
-	struct usb_page_cache ctx_pc;
-	struct usb_page_cache scratch_pc[XHCI_MAX_SCRATCHPADS];
+	struct usb_page_cache	root_pc;
+	struct usb_page_cache	ctx_pc;
+	struct usb_page_cache	scratch_pc[XHCI_MAX_SCRATCHPADS];
 
-	struct usb_page root_pg;
-	struct usb_page ctx_pg;
-	struct usb_page scratch_pg[XHCI_MAX_SCRATCHPADS];
+	struct usb_page		root_pg;
+	struct usb_page		ctx_pg;
+	struct usb_page		scratch_pg[XHCI_MAX_SCRATCHPADS];
 
-	struct xhci_hw_dev devs[XHCI_MAX_DEVICES + 1];
+	struct xhci_hw_dev	devs[XHCI_MAX_DEVICES + 1];
 };
 
 struct xhci_config_desc {
-	struct usb_config_descriptor confd;
-	struct usb_interface_descriptor ifcd;
-	struct usb_endpoint_descriptor endpd;
-	struct usb_endpoint_ss_comp_descriptor endpcd;
+	struct usb_config_descriptor		confd;
+	struct usb_interface_descriptor		ifcd;
+	struct usb_endpoint_descriptor		endpd;
+	struct usb_endpoint_ss_comp_descriptor	endpcd;
 } __packed;
 
 struct xhci_bos_desc {
-	struct usb_bos_descriptor bosd;
-	struct usb_devcap_usb2ext_descriptor usb2extd;
-	struct usb_devcap_ss_descriptor usbdcd;
+	struct usb_bos_descriptor		bosd;
+	struct usb_devcap_usb2ext_descriptor	usb2extd;
+	struct usb_devcap_ss_descriptor		usbdcd;
 	struct usb_devcap_container_id_descriptor cidd;
 } __packed;
 
 union xhci_hub_desc {
-	struct usb_status stat;
-	struct usb_port_status ps;
-	struct usb_hub_ss_descriptor hubd;
-	uint8_t	temp[128];
+	struct usb_status		stat;
+	struct usb_port_status		ps;
+	struct usb_hub_ss_descriptor	hubd;
+	uint8_t				temp[128];
 };
 
 struct xhci_softc {
-	struct xhci_hw_softc sc_hw;
-	struct usb_bus sc_bus;		/* base device */
-	struct usb_process sc_config_proc;	/* configure process */
-	struct usb_bus_msg sc_config_msg[2];
+	struct xhci_hw_softc	sc_hw;
+	/* base device */
+	struct usb_bus		sc_bus;
+	/* configure process */
+	struct usb_process	sc_config_proc;
+	struct usb_bus_msg	sc_config_msg[2];
 
-	union xhci_hub_desc sc_hub_desc;
+	union xhci_hub_desc	sc_hub_desc;
 
-	struct cv sc_cmd_cv;
-	struct sx sc_cmd_sx;
+	struct cv		sc_cmd_cv;
+	struct sx		sc_cmd_sx;
 
-	struct usb_device *sc_devices[XHCI_MAX_DEVICES];
-	struct resource *sc_io_res;
-	struct resource *sc_irq_res;
+	struct usb_device	*sc_devices[XHCI_MAX_DEVICES];
+	struct resource		*sc_io_res;
+	struct resource		*sc_irq_res;
 
-	void   *sc_intr_hdl;
-	bus_size_t sc_io_size;
-	bus_space_tag_t sc_io_tag;
-	bus_space_handle_t sc_io_hdl;
+	void			*sc_intr_hdl;
+	bus_size_t		sc_io_size;
+	bus_space_tag_t		sc_io_tag;
+	bus_space_handle_t	sc_io_hdl;
+	/* last pending command address */
+	uint64_t		sc_cmd_addr;
+	/* result of command */
+	uint32_t		sc_cmd_result[2];
+ 	/* copy of cmd register */
+	uint32_t		sc_cmd;
+	/* worst case exit latency */
+	uint32_t		sc_exit_lat_max;
 
-	uint64_t sc_cmd_addr;		/* current pending command */
-	uint32_t sc_cmd_result[2];	/* result of command */
+	/* offset to operational registers */
+	uint32_t		sc_oper_off;
+	/* offset to capability registers */
+	uint32_t		sc_capa_off;
+	/* offset to runtime registers */
+	uint32_t		sc_runt_off;
+	/* offset to doorbell registers */
+	uint32_t		sc_door_off;
 
-	uint32_t sc_cmd;		/* copy of cmd register */
-	uint32_t sc_exit_lat_max;	/* worst case exit latency */
+	/* chip specific */
+	uint16_t		sc_erst_max;
+	uint16_t		sc_event_idx;
+	uint16_t		sc_command_idx;
 
-	uint32_t sc_oper_off;		/* offset to operational registers */
-	uint32_t sc_capa_off;		/* offset to capability registers */
-	uint32_t sc_runt_off;		/* offset to runtime registers */
-	uint32_t sc_door_off;		/* offset to doorbell registers */
+	uint8_t			sc_event_ccs;
+	uint8_t			sc_command_ccs;
+	/* number of XHCI device slots */
+	uint8_t			sc_noslot;
+	/* number of ports on root HUB */
+	uint8_t			sc_noport;
+	/* number of scratch pages */
+	uint8_t			sc_noscratch;
+	/* root HUB device configuration */
+	uint8_t			sc_conf;
+	uint8_t			sc_hub_idata[2];
 
-	uint16_t sc_flags;		/* chip specific flags */
-	uint16_t sc_erst_max;
-	uint16_t sc_event_idx;
-	uint16_t sc_command_idx;
-
-	uint8_t sc_event_ccs;
-	uint8_t sc_command_ccs;
-	uint8_t	sc_noslot;		/* number of XHCI device slots */
-	uint8_t	sc_noport;		/* number of ports on root HUB */
-	uint8_t sc_noscratch;		/* number of scratch pages */
-	uint8_t	sc_conf;		/* root HUB device configuration */
-	uint8_t	sc_hub_idata[2];
-
-	char	sc_vendor[16];		/* vendor string for root hub */
-
+	/* vendor string for root HUB */
+	char			sc_vendor[16];
 };
 
 #define	XHCI_CMD_LOCK(sc)	sx_xlock(&(sc)->sc_cmd_sx)
@@ -471,13 +485,13 @@
 
 /* prototypes */
 
-void xhci_suspend(struct xhci_softc *);
-void xhci_resume(struct xhci_softc *);
-void xhci_shutdown(struct xhci_softc *);
+usb_error_t xhci_halt_controller(struct xhci_softc *);
 usb_error_t xhci_init(struct xhci_softc *, device_t);
-void xhci_uninit(struct xhci_softc *);
 usb_error_t xhci_start_controller(struct xhci_softc *);
-usb_error_t xhci_halt_controller(struct xhci_softc *);
-void xhci_interrupt(struct xhci_softc *);
+void	xhci_interrupt(struct xhci_softc *);
+void	xhci_resume(struct xhci_softc *);
+void	xhci_shutdown(struct xhci_softc *);
+void	xhci_suspend(struct xhci_softc *);
+void	xhci_uninit(struct xhci_softc *);
 
 #endif					/* _XHCI_H_ */

From owner-p4-projects@FreeBSD.ORG  Fri Oct  1 13:03:07 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E3C761065672; Fri,  1 Oct 2010 13:03: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 A676F106566B
	for ; Fri,  1 Oct 2010 13:03:06 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 943B98FC22
	for ; Fri,  1 Oct 2010 13:03:06 +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 o91D36No079994
	for ; Fri, 1 Oct 2010 13:03:06 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o91D364W079991
	for perforce@freebsd.org; Fri, 1 Oct 2010 13:03:06 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Fri, 1 Oct 2010 13:03:06 GMT
Message-Id: <201010011303.o91D364W079991@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 184338 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: Fri, 01 Oct 2010 13:03:07 -0000

http://p4web.freebsd.org/@@184338?ac=10

Change 184338 by hselasky@hselasky_laptop001 on 2010/10/01 13:02:03

	USB WLAN:
		 - Add new device ID
	
	PR:		usb/150989

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/wlan/if_upgt.c#24 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/wlan/if_upgt.c#24 (text+ko) ====

@@ -182,6 +182,7 @@
 	UPGT_DEV(FSC,		E5400),
 	UPGT_DEV(GLOBESPAN,	PRISM_GT_1),
 	UPGT_DEV(GLOBESPAN,	PRISM_GT_2),
+	UPGT_DEV(NETGEAR,	WG111V2_2),
 	UPGT_DEV(INTERSIL,	PRISM_GT),
 	UPGT_DEV(SMC,		2862WG),
 	UPGT_DEV(USR,		USR5422),

From owner-p4-projects@FreeBSD.ORG  Fri Oct  1 13:09:42 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3CAFB1065674; Fri,  1 Oct 2010 13:09:42 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F3739106564A
	for ; Fri,  1 Oct 2010 13:09:41 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id E126B8FC1B
	for ; Fri,  1 Oct 2010 13:09:41 +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 o91D9fWt080048
	for ; Fri, 1 Oct 2010 13:09:41 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o91D9fbg080045
	for perforce@freebsd.org; Fri, 1 Oct 2010 13:09:41 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Fri, 1 Oct 2010 13:09:41 GMT
Message-Id: <201010011309.o91D9fbg080045@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 184339 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: Fri, 01 Oct 2010 13:09:42 -0000

http://p4web.freebsd.org/@@184339?ac=10

Change 184339 by hselasky@hselasky_laptop001 on 2010/10/01 13:08:41

	USB WLAN:
		- add new USB device ID's
	
	PR:		usb/151043

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usbdevs#140 edit
.. //depot/projects/usb/src/sys/dev/usb/wlan/if_rum.c#33 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/usbdevs#140 (text+ko) ====

@@ -2128,6 +2128,8 @@
 product MELCO KG54L		0x00da	WLI-U2-KG54L
 product MELCO WLIUCG300N	0x00e8	WLI-UC-G300N
 product MELCO SG54HG		0x00f4	WLI-U2-SG54HG
+product MELCO WLRUCG		0x0116	WLR-UC-G
+product MELCO WLRUCGAOSS	0x0119	WLR-UC-G-AOSS
 product MELCO WLIUCAG300N	0x012e	WLI-UC-AG300N
 product MELCO RT2870_1		0x0148	RT2870
 product MELCO RT2870_2		0x0150	RT2870

==== //depot/projects/usb/src/sys/dev/usb/wlan/if_rum.c#33 (text+ko) ====

@@ -118,6 +118,8 @@
     RUM_DEV(HUAWEI3COM, WUB320G),
     RUM_DEV(MELCO, G54HP),
     RUM_DEV(MELCO, SG54HP),
+    RUM_DEV(MELCO, WLRUCG),
+    RUM_DEV(MELCO, WLRUCGAOSS),
     RUM_DEV(MSI, RT2573_1),
     RUM_DEV(MSI, RT2573_2),
     RUM_DEV(MSI, RT2573_3),

From owner-p4-projects@FreeBSD.ORG  Fri Oct  1 15:59:24 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 22E6C1065673; Fri,  1 Oct 2010 15:59:24 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CBB21106564A
	for ; Fri,  1 Oct 2010 15:59:23 +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 B9D258FC18
	for ; Fri,  1 Oct 2010 15:59:23 +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 o91FxNRN015377
	for ; Fri, 1 Oct 2010 15:59:23 GMT
	(envelope-from lz@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o91FxN3b015374
	for perforce@freebsd.org; Fri, 1 Oct 2010 15:59:23 GMT
	(envelope-from lz@FreeBSD.org)
Date: Fri, 1 Oct 2010 15:59:23 GMT
Message-Id: <201010011559.o91FxN3b015374@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 184345 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: Fri, 01 Oct 2010 15:59:24 -0000

http://p4web.freebsd.org/@@184345?ac=10

Change 184345 by lz@freebsd-current on 2010/10/01 15:58:29

	Recovery ext2fs to eliminate duplication of code.

Affected files ...

.. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_alloc.c#7 add
.. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_balloc.c#7 add
.. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_bmap.c#7 add
.. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_dinode.h#6 add
.. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_dir.h#5 add
.. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_extern.h#6 add
.. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_inode.c#8 add
.. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_inode_cnv.c#9 add
.. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_lookup.c#8 add
.. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_mount.h#5 add
.. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_readwrite.c#12 add
.. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_rsv_win.h#9 add
.. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_subr.c#8 add
.. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_vfsops.c#15 add
.. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_vnops.c#6 add
.. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2fs.h#13 add
.. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/fs.h#5 add
.. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/inode.h#10 add
.. //depot/projects/soc2010/ext4fs/src/sys/modules/ext2fs/Makefile#4 add

Differences ...

From owner-p4-projects@FreeBSD.ORG  Sat Oct  2 22:41:01 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B192E1065674; Sat,  2 Oct 2010 22:41:01 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5B46A106566B
	for ; Sat,  2 Oct 2010 22:41:01 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 48A5E8FC14
	for ; Sat,  2 Oct 2010 22:41:01 +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 o92Mf143001833
	for ; Sat, 2 Oct 2010 22:41:01 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o92Mf1qY001825
	for perforce@freebsd.org; Sat, 2 Oct 2010 22:41:01 GMT
	(envelope-from rene@FreeBSD.org)
Date: Sat, 2 Oct 2010 22:41:01 GMT
Message-Id: <201010022241.o92Mf1qY001825@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	rene@FreeBSD.org using -f
From: Rene Ladan 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 184376 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: Sat, 02 Oct 2010 22:41:01 -0000

http://p4web.freebsd.org/@@184376?ac=10

Change 184376 by rene@rene_acer on 2010/10/02 22:40:38

	IFC

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#72 integrate
.. //depot/projects/docproj_nl/www/en/donations/index.sgml#3 integrate
.. //depot/projects/docproj_nl/www/en/donations/wantlist.sgml#23 integrate
.. //depot/projects/docproj_nl/www/en/ports/categories#3 integrate

Differences ...

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

@@ -1,4 +1,4 @@
-
+