From owner-p4-projects@FreeBSD.ORG Sun Apr 3 19:22:39 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 328D41065675; Sun, 3 Apr 2011 19:22:39 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E84D2106564A for ; Sun, 3 Apr 2011 19:22:38 +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 D469C8FC13 for ; Sun, 3 Apr 2011 19:22:38 +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 p33JMcUv050715 for ; Sun, 3 Apr 2011 19:22:38 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p33JMcRt050712 for perforce@freebsd.org; Sun, 3 Apr 2011 19:22:38 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 3 Apr 2011 19:22:38 GMT Message-Id: <201104031922.p33JMcRt050712@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 190980 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, 03 Apr 2011 19:22:39 -0000 http://p4web.freebsd.org/@@190980?ac=10 Change 190980 by rene@rene_acer on 2011/04/03 19:22:08 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#61 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#20 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/install/chapter.sgml#18 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#103 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#55 integrate .. //depot/projects/docproj_nl/share/pgpkeys/art.key#1 branch .. //depot/projects/docproj_nl/share/pgpkeys/avg.key#2 integrate .. //depot/projects/docproj_nl/share/pgpkeys/ed.key#2 integrate .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#53 integrate .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#50 integrate .. //depot/projects/docproj_nl/share/sgml/mirrors.xml#25 integrate .. //depot/projects/docproj_nl/www/en/cgi/man.cgi#23 integrate .. //depot/projects/docproj_nl/www/en/developers.sgml#54 integrate .. //depot/projects/docproj_nl/www/en/projects/2011-freebsd-gsoc.jpg#1 branch .. //depot/projects/docproj_nl/www/en/projects/2011-freebsd-gsoc.pdf#1 branch .. //depot/projects/docproj_nl/www/en/projects/Makefile#4 integrate .. //depot/projects/docproj_nl/www/en/projects/ideas/ideas.xsl#4 integrate .. //depot/projects/docproj_nl/www/en/projects/summerofcode.xsl#7 integrate .. //depot/projects/docproj_nl/www/share/sgml/header.ent#8 integrate .. //depot/projects/docproj_nl/www/share/sgml/navibar.ent#10 integrate .. //depot/projects/docproj_nl/www/share/sgml/news.xml#106 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#61 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -171,32 +171,37 @@ Firefox is a modern, free, - open-source stable browser that is fully ported to &os;: it - features a very standards-compliant HTML display engine, - tabbed browsing, popup blocking, extensions, improved - security, and more. Firefox is - based on the Mozilla - codebase. + open-source stable browser that is fully ported to &os;: it + features a very standards-compliant HTML display engine, + tabbed browsing, popup blocking, extensions, improved + security, and more. Firefox is + based on the Mozilla codebase. Install the package by typing: &prompt.root; pkg_add -r firefox - This will install Firefox 3.6, - if you want to run Firefox 3.5, - use instead: + This will install Firefox 4.0, + if you want to run Firefox 3.6, + use instead: + + &prompt.root; pkg_add -r firefox36 + + If you want to run Firefox 3.5, + use instead: &prompt.root; pkg_add -r firefox35 You can also use the Ports Collection if you - prefer to compile from source code: + prefer to compile from source code: &prompt.root; cd /usr/ports/www/firefox &prompt.root; make install clean - For Firefox 3.5, in the - previous command replace firefox with - firefox35. + For Firefox 3.6, in the + previous command replace firefox with + firefox36. For Firefox + 3.5 use firefox35 instead. @@ -275,7 +280,7 @@ - For Firefox 3.6 + For Firefox 3.6 and 4.0 Install OpenJDK 6 through the Ports Collection by typing: @@ -794,8 +799,8 @@ During the first launch, you will be asked some - questions and a .libreoffice folder - will be created in your home directory. + questions and a .libreoffice + folder will be created in your home directory. If the LibreOffice packages ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/install/chapter.sgml#18 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -708,7 +708,7 @@ Acquire the Boot Floppy Images - Please note, as of &os; 8.0, floppy disk images are + Please note, as of &os; 8.X, floppy disk images are no longer available. Please see above for instructions on how to install &os; using a USB memory stick or just use a CDROM or a DVD. @@ -895,7 +895,7 @@ opportunity. - For &os; 7.3 and previous versions, installation + For &os; 7.X, installation boot floppies are available and can be prepared as described in . One of them will be the first boot disc: @@ -3041,8 +3041,8 @@ Linux Compatibility - This part only applies to &os; 7.X installation, if - you install &os; 8.X this screen will not be + This part only applies to &os; 7.X installation, if + you install &os; 8.X this screen will not be proposed. @@ -4369,11 +4369,11 @@ From the &os; system where is saved the installation ISO image, for example - &os;-8.1-RELEASE-i386-disc1.iso, + &os;-&rel.current;-RELEASE-i386-disc1.iso, use the &man.tar.1; utility to extract all the files: &prompt.root; mkdir /path/to/headless-iso -&prompt.root; tar -C /path/to/headless-iso -pxvf &os;-8.1-RELEASE-i386-disc1.iso +&prompt.root; tar -C /path/to/headless-iso -pxvf &os;-&rel.current;-RELEASE-i386-disc1.iso Now you must set the installation media to boot into a serial console. You have to add to the @@ -4389,7 +4389,7 @@ used: &prompt.root; mkisofs -v -b boot/cdboot -no-emul-boot -r -J -V "Headless_install" \ - -o Headless-&os;-8.1-RELEASE-i386-disc1.iso /path/to/headless-iso + -o Headless-&os;-&rel.current;-RELEASE-i386-disc1.iso /path/to/headless-iso Now that you have your ISO image configured correctly, you can burn it on a CD-R with your favorite burning @@ -4430,7 +4430,7 @@ &prompt.root; cu -l /dev/cuau0 - On &os; 7.X use the following command + On &os; 7.X use the following command instead: &prompt.root; cu -l /dev/cuad0 @@ -4553,8 +4553,7 @@ 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.X. @@ -4570,7 +4569,7 @@ A CD image with as many third-party packages as would fit on the disc. This image is not - available for &os; 8.0 and later. + available for &os; 8.X. @@ -4578,7 +4577,7 @@ Another CD image with as many third-party packages as would fit on the disc. This image is - not available for &os; 8.0 and later. + not available for &os; 8.X. @@ -4599,8 +4598,8 @@ - &os; 7.X releases before &os; 7.3 and - &os; 8.X releases before &os; 8.1 used a + &os; 7.X releases before &os; 7.3 and + &os; 8.0 used a different naming convention. The names of their ISO images are not prefixed with &os;-. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#103 (text+ko) ==== @@ -1,7 +1,7 @@ USE_XFCE= mcsmanager configenv + + Using Mozilla + + + Variables for ports that use Mozilla + + + + + + USE_GECKO + + Gecko backend the port can handle. Possible values: + libxul (libxul.so), + seamonkey (libgtkembedmoz.so, + deprecated, shouldn't be used anymore). + + + USE_FIREFOX + + The port requires Firefox as a runtime dependency. + Possible values: + yes (get default version), + 40, 36, + 35. + Default dependency is on version + 40. + + + USE_FIREFOX_BUILD + + The port requires Firefox as a buildtime dependency. + Possible values: see USE_FIREFOX. + This automatically sets USE_FIREFOX and + assigns the same value. + + + USE_SEAMONKEY + + The port requires SeaMonkey as a runtime dependency. + Possible values: + yes (get default version), + 20, 11 + (deprecated, shouldn't be used anymore). + Default dependency is on version + 20. + + + USE_SEAMONKEY_BUILD + + The port requires SeaMonkey as a buildtime dependency. + Possible values: see USE_SEAMONKEY. + This automatically sets USE_SEAMONKEY and + assigns the same value. + + + USE_THUNDERBIRD + + The port requires Thunderbird as a runtime dependency. + Possible values: + yes (get default version), + 31, 30 + (deprecated, shouldn't be used anymore). + Default dependency is on version + 31. + + + USE_THUNDERBIRD_BUILD + + The port requires Thunderbird as a buildtime dependency. + Possible values: see USE_THUNDERBIRD. + This automatically sets USE_THUNDERBIRD + and assigns the same value. + + + + +
+ A complete list of available variables can be found in + /usr/ports/Mk/bsd.gecko.mk. + + + Using databases ==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#55 (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.536 2011/03/17 20:13:23 sbz Exp $ + $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.537 2011/04/02 00:01:54 art Exp $ --> aaron@FreeBSD.org"> @@ -88,6 +88,8 @@ arr@FreeBSD.org"> +art@FreeBSD.org"> + arun@FreeBSD.org"> arved@FreeBSD.org"> ==== //depot/projects/docproj_nl/share/pgpkeys/avg.key#2 (text+ko) ==== @@ -1,10 +1,11 @@ - + uid Andriy Gapon (FreeBSD) uid Andriy Gapon (FreeBSD) sub 4096R/F9A4D312 2009-02-16 @@ -18,46 +19,54 @@ FmzObn+W1adLT3r835x5mst9vBfuRFCTnm/yCHStkPTpW2mZ3njfDWEiQKc0ANaw EOEthnekr0jRvJmnC53JsJlwVH9yv9CY5EM5gVehmKuRok8NcVaPdNA7M9CATpaC eYQ+by4j5RBSMgXlFxhjHxM6VfGNv5vb6KG/ABEBAAG0KEFuZHJpeSBHYXBvbiAo -RnJlZUJTRCkgPGF2Z0BpY3liLm5ldC51YT6JATYEEwECACAFAkmZYl4CGwMGCwkI -BwMCBBUCCAMEFgIDAQIeAQIXgAAKCRB0pS0nplH+LxrvB/0R7uiYKZE63nqMbL2P -9mqrbpC3PmrA0bNpfonu4wSOyvgeK/xJ0MTnSUTv5LLb1g+qF45LZSkYXsjncD+i -HfLID68iSHBSWxQwgLePN1cEpDgcec/2YTpWBdzlC6Q4EtGunZs5jhEC9a4wDqBx -uRzhexNDEiRzN0bZwqg/E2T7eY0oXfpwpdwsfAeuPniEwEJSFjSreMwg71wPIAb5 -HcuMieKnxjlqDEW7xQ0nrTydWnhxVvJoeVdB93mKnmhtQ9K/G6cV0q75Au5qy0au -ztmXi8XaK/pyYxCbmhSPRC/u6Bo9K7rx6+MxtGX8YQd1VLC1kfNCx3JfETA8P1QE -nJQstChBbmRyaXkgR2Fwb24gKEZyZWVCU0QpIDxhdmdAZnJlZWJzZC5vcmc+iQE5 -BBMBAgAjAhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AFAkmZZdACGQEACgkQdKUt -J6ZR/i9dkggAlly9aIHTmseVjpdHD67VZ3sZWPvb/QaZ905mOj6fhxb4MVlwl49o -9VmO0Pd1Als5FziaDnRBGiB61MjqDiCNxRfn7K1LJ+hf52ax3o+4oWQ7pDWwNPfS -4qdnqnwpZL3uL4EtaU6r4Ix5bz7ekoYUV88sORR0fYueJqxDJcom6ZnDKEG6RrCM -mzuiXhDfEWdLD2mdMvKeTAd1hGK+dLrIy8hmjH3zn4POkXe+d4qIJ0ENG1rlXTST -KdrIUPUjQSmS6W9fCrBF97C8ii384XbPUd/rQkDBLC3jcqGpuHhzGTLYza53dlvB -4qk0CaXOd8cOu3i1ac5ldiMuAcmv/bqg6okBNgQTAQIAIAUCSZlhjAIbAwYLCQgH -AwIEFQIIAwQWAgMBAh4BAheAAAoJEHSlLSemUf4v8+YIAKgxK/MtfJ+CpAc/HPR3 -JFy8jWEkFanKgYIClzydEb3ONHkhFzNIUJIdPHNq4NGpWT7sKJg7u/0ojjPuAI+y -AniD632Ki6q2MGBZp7jVll4B3q3+wKvaTT+h+Q1UvNjOmTbTZaHifRP6ufBNjlQ4 -BoXFUpYYLGNcH8Zal5G3CcBWAsfXt0iAM5mLVVpJEzaQTDFCEKpeSInhiKYxGyFG -dGcffr98sUZhLrdx2Pl5H1hD6G+DBRYZLXag7cEumPjuikrgxZNAeHEyz3QfhPFh -l6YJKm7HBy3DNwrg57+jDBHx7AWviq87MzU1XnWWns5Fi1WLPSlyAKSGWMHqITfj -7NqIRgQQEQIABgUCSZmGVgAKCRB8Pwz8BJPKAl0OAJ9OvtFwX62D5OfoZ+jwtRka -qv1scgCeLrS4nYea2JBdVmDi9dS/d4LdOF25Ag0ESZlhwAEQANe1Q5ZfTOc+6I7S -S7KBrbz+Rdo0iEg6or7rrKUC62Vm8aX97yzBsgXzwQXBjD64DiJ1Lely+RRdE1Rs -77/b81WHOYYBExtrcNXmbwxWqSs7Vxf8yBd/uB9n24sf2KhbVFKOeGXiB+76Ls6Q -F3cOmQeeyGR+Rk7Trk4O/UxUPnoGFTM7yuFjZnf5R2c2BfprUvZ1OdIax3BxqDAk -TF1BvmdAYeTqf+45+2DY1qD5w0o5AcCOovOk0mj/3qUbFMngtaVgiEnQEUYpH8RK -vFecaB13JAOjvcf8HppNtMiY/WC2vKeBI8XTVP4JB8h0agalQUabcXpMdA+J8Q5s -0zFAueYfzfDOtjxjgoA3c7GKk8Hkj4rtaa1nbTgIGJ4of+gpuNSA+AmLOPrLAcSm -xQWsayfvrMdCWIwjSkbqB4yAiffIdI11buH44XmU9VoB/EuyxZ0eWft61kBQIKtM -ES+YMiEEEHb8R8I/2wgJx35hywHUlOKn163em8Rcwbm/i9Myx4pc9RVSsz9IBsUe -bHOi3v0kfVrxLIwpqfUc/Ryla/+BW3W08WeJ5AW/hv+OU7HHnNTaBeNTX0MRe6Bx -jbDYT+M0iizIU7itI8Ki/wDYhhbwKq+WLvozPHoHQv4rRnuwdvW8LQmdrIE21k+5 -XrphH1jIOMo3GosT2wEopaIbjC9dABEBAAGJAR8EGAECAAkFAkmZYcACGwwACgkQ -dKUtJ6ZR/i8Gswf/WvKsYhmIPPzshU9e2LYXCNYSsoaayqcwpH4z2UzFOQ6GdOJq -DaPYCvFS+gllkktfKJ+qXjvwMrJOyyONVIr34XJTKc+5dX2kKMu/CnSNkBD+nfDo -tUk9Hd1Z5zGaNrPwy02y9KWqYASKIWNNFIttL0XEnMfW8CLWQrLzmKRlxWZPC1Lk -TnYVtxH7RrM3VTbBBfyeMypbdj7Wc1/kEu4xqXgTI6FhXkgTR8Ag1LGP4x32rzBS -QtuMayhOSUUQZrJpcQYQpSl3j/AGaXuC4sHRpgpomR3B98cCUwcJuQJtCK03W57U -maATzhsOLAzTARzC9+OmDsItyFnveYUKQQEUwg== -=4PiO +RnJlZUJTRCkgPGF2Z0BmcmVlYnNkLm9yZz6JATYEEwECACACGwMGCwkIBwMCBBUC +CAMEFgIDAQIeAQIXgAUCTZIc5wAKCRB0pS0nplH+Lza+B/9yy9a2zLMK9TmzETmI +sE+1gPZiV5BjnM5lAFhdeENb23cRhHAKfzZ3k/A/op/Dzode5926x+naJ21fouo6 +2eZBckvQ1A3HZSST1aVkgjxGW3l33JkE8hOcT1cjrjTcf2eePsQ88roQaDnyqzB3 +rVq2sAvmREyNEMA6NoKImKZSzWEOHg453riYhFYGoxSf9UjpLWpn6slx0E6iNjwO +J3yGBTuKufnRvV2PInFvZMWZV3G5NECT5XfHcEOswx4nKUx3dV2NYKkSqJm3rCHL +qamRmCfYPIHTfrw46dLRzF018AhG8Rh5rEX1vho/Ooy9ePWLBs+nLXHzu+pLMMiL +d5UQiQE2BBMBAgAgBQJJmWGMAhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQ +dKUtJ6ZR/i/z5ggAqDEr8y18n4KkBz8c9HckXLyNYSQVqcqBggKXPJ0Rvc40eSEX +M0hQkh08c2rg0alZPuwomDu7/SiOM+4Aj7ICeIPrfYqLqrYwYFmnuNWWXgHerf7A +q9pNP6H5DVS82M6ZNtNloeJ9E/q58E2OVDgGhcVSlhgsY1wfxlqXkbcJwFYCx9e3 +SIAzmYtVWkkTNpBMMUIQql5IieGIpjEbIUZ0Zx9+v3yxRmEut3HY+XkfWEPob4MF +FhktdqDtwS6Y+O6KSuDFk0B4cTLPdB+E8WGXpgkqbscHLcM3CuDnv6MMEfHsBa+K +rzszNTVedZaezkWLVYs9KXIApIZYweohN+Ps2ohGBBARAgAGBQJJmYZWAAoJEHw/ +DPwEk8oCXQ4An06+0XBfrYPk5+hn6PC1GRqq/WxyAJ4utLidh5rYkF1WYOL11L93 +gt04XbQoQW5kcml5IEdhcG9uIChGcmVlQlNEKSA8YXZnQGljeWIubmV0LnVhPokB +NgQTAQIAIAUCSZliXgIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEHSlLSem +Uf4vGu8H/RHu6JgpkTreeoxsvY/2aqtukLc+asDRs2l+ie7jBI7K+B4r/EnQxOdJ +RO/kstvWD6oXjktlKRheyOdwP6Id8sgPryJIcFJbFDCAt483VwSkOBx5z/ZhOlYF +3OULpDgS0a6dmzmOEQL1rjAOoHG5HOF7E0MSJHM3RtnCqD8TZPt5jShd+nCl3Cx8 +B64+eITAQlIWNKt4zCDvXA8gBvkdy4yJ4qfGOWoMRbvFDSetPJ1aeHFW8mh5V0H3 +eYqeaG1D0r8bpxXSrvkC7mrLRq7O2ZeLxdor+nJjEJuaFI9EL+7oGj0ruvHr4zG0 +ZfxhB3VUsLWR80LHcl8RMDw/VASclCy0KEFuZHJpeSBHYXBvbiAoRnJlZUJTRCkg +PGF2Z0BGcmVlQlNELm9yZz6JATsEEwECACUCGwMGCwkIBwMCBhUIAgkKCwQWAgMB +Ah4BAheABQJNkhznAhkBAAoJEHSlLSemUf4v3jcH/1/K3ismEtZOFHWXL4lbH5WS +/XdfVyFvrZtDwZYtFZJYKv6KVW0uyk1wc9PMR7Zj5c85krTwUxMbYxXWAqxuVJMq +2iqCkny8MSReJcLPYuBzmAaSIGy9MOsh2ZNtcXTB8zHAMH51hYUK+QPpM/HuTrqr +4F+wLxnl0udi4BUbo3pIvxexneGdxxVi2mbTtMzjJGwS4JwnrGdmUJaZDDb8FL/U +Ev98KIJK4HqXJPZYEBoSqwCgDaWh032l3JM5yZ+qsT9er+dwOhG+zHNliQ6bIkou +2geD+/6//UmsY0gXsvLJrlhASQoXUZ72Mh6tiQpOvCqm4m25nYyIspnQBK7u9hu5 +Ag0ESZlhwAEQANe1Q5ZfTOc+6I7SS7KBrbz+Rdo0iEg6or7rrKUC62Vm8aX97yzB +sgXzwQXBjD64DiJ1Lely+RRdE1Rs77/b81WHOYYBExtrcNXmbwxWqSs7Vxf8yBd/ +uB9n24sf2KhbVFKOeGXiB+76Ls6QF3cOmQeeyGR+Rk7Trk4O/UxUPnoGFTM7yuFj +Znf5R2c2BfprUvZ1OdIax3BxqDAkTF1BvmdAYeTqf+45+2DY1qD5w0o5AcCOovOk +0mj/3qUbFMngtaVgiEnQEUYpH8RKvFecaB13JAOjvcf8HppNtMiY/WC2vKeBI8XT +VP4JB8h0agalQUabcXpMdA+J8Q5s0zFAueYfzfDOtjxjgoA3c7GKk8Hkj4rtaa1n +bTgIGJ4of+gpuNSA+AmLOPrLAcSmxQWsayfvrMdCWIwjSkbqB4yAiffIdI11buH4 +4XmU9VoB/EuyxZ0eWft61kBQIKtMES+YMiEEEHb8R8I/2wgJx35hywHUlOKn163e +m8Rcwbm/i9Myx4pc9RVSsz9IBsUebHOi3v0kfVrxLIwpqfUc/Ryla/+BW3W08WeJ +5AW/hv+OU7HHnNTaBeNTX0MRe6BxjbDYT+M0iizIU7itI8Ki/wDYhhbwKq+WLvoz +PHoHQv4rRnuwdvW8LQmdrIE21k+5XrphH1jIOMo3GosT2wEopaIbjC9dABEBAAGJ +AR8EGAECAAkFAkmZYcACGwwACgkQdKUtJ6ZR/i8Gswf/WvKsYhmIPPzshU9e2LYX +CNYSsoaayqcwpH4z2UzFOQ6GdOJqDaPYCvFS+gllkktfKJ+qXjvwMrJOyyONVIr3 +4XJTKc+5dX2kKMu/CnSNkBD+nfDotUk9Hd1Z5zGaNrPwy02y9KWqYASKIWNNFItt +L0XEnMfW8CLWQrLzmKRlxWZPC1LkTnYVtxH7RrM3VTbBBfyeMypbdj7Wc1/kEu4x +qXgTI6FhXkgTR8Ag1LGP4x32rzBSQtuMayhOSUUQZrJpcQYQpSl3j/AGaXuC4sHR +pgpomR3B98cCUwcJuQJtCK03W57UmaATzhsOLAzTARzC9+OmDsItyFnveYUKQQEU +wg== +=/KPo -----END PGP PUBLIC KEY BLOCK----- ]]> ==== //depot/projects/docproj_nl/share/pgpkeys/ed.key#2 (text+ko) ==== @@ -1,512 +1,77 @@ - + -uid Ed Schouten -uid Ed Schouten (Fontys Hogescholen Eindhoven) -uid Ed Schouten (Dispuut Interlink) +pub 4096R/3491A2BB 2011-03-12 [expires: 2016-03-10] + Key fingerprint = A110 5982 A887 74A2 F4B1 D70A 6E5E D8FE 3491 A2BB +uid Ed Schouten (The FreeBSD Project) uid Ed Schouten -sub 4096g/80043EEA 2006-03-21 [expires: 2011-03-20] +sub 4096R/81BB41E6 2011-03-12 [expires: 2016-03-10] ]]> >> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Apr 3 19:27:03 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 283E91065709; Sun, 3 Apr 2011 19:27:03 +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 DE39B1065708 for ; Sun, 3 Apr 2011 19:27:02 +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 CC4648FC22 for ; Sun, 3 Apr 2011 19:27:02 +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 p33JR29u050824 for ; Sun, 3 Apr 2011 19:27:02 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p33JR2vL050821 for perforce@freebsd.org; Sun, 3 Apr 2011 19:27:02 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 3 Apr 2011 19:27:02 GMT Message-Id: <201104031927.p33JR2vL050821@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 190982 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, 03 Apr 2011 19:27:03 -0000 http://p4web.freebsd.org/@@190982?ac=10 Change 190982 by rene@rene_acer on 2011/04/03 19:26:49 Update pointyhat link to 8-latest Submitted by: Arthur_ on bsddocs Affected files ... .. //depot/projects/docproj_nl/www/en/platforms/ia64/todo.xsl#2 edit Differences ... ==== //depot/projects/docproj_nl/www/en/platforms/ia64/todo.xsl#2 (text+ko) ==== @@ -89,7 +89,7 @@ collection has been targeting ia32 for the most part, so it is not surprising that there are a lot of ports that do not build or do not work on ia64. Look - + here for the most up-to-date list of ports that fail to build for some From owner-p4-projects@FreeBSD.ORG Mon Apr 4 02:30:37 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BBA381065673; Mon, 4 Apr 2011 02:30:37 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7E4EA106564A for ; Mon, 4 Apr 2011 02:30:37 +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 688F28FC1C for ; Mon, 4 Apr 2011 02:30:37 +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 p342UbOF029286 for ; Mon, 4 Apr 2011 02:30:37 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p342UbFb029283 for perforce@freebsd.org; Mon, 4 Apr 2011 02:30:37 GMT (envelope-from jhb@freebsd.org) Date: Mon, 4 Apr 2011 02:30:37 GMT Message-Id: <201104040230.p342UbFb029283@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 191000 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, 04 Apr 2011 02:30:38 -0000 http://p4web.freebsd.org/@@191000?ac=10 Change 191000 by jhb@jhb_fiver on 2011/04/04 02:30:31 Checkpoint more PCI-PCI bridge resource stuff. Affected files ... .. //depot/projects/pci/sys/dev/pci/pci.c#11 edit .. //depot/projects/pci/sys/dev/pci/pci_pci.c#4 edit .. //depot/projects/pci/sys/dev/pci/pcib_private.h#4 edit Differences ... ==== //depot/projects/pci/sys/dev/pci/pci.c#11 (text+ko) ==== @@ -3945,6 +3945,25 @@ break; case SYS_RES_IOPORT: case SYS_RES_MEMORY: +#ifdef NEW_PCIB + /* + * PCI-PCI bridge I/O window resources are not BARs. + * For those allocations just pass the request up the + * tree. + */ + if (cfg->hdrtype == PCIM_HDRTYPE_BRIDGE) { + switch (*rid) { + case PCIR_IOBASEL_1: + case PCIR_MEMBASE_1: + case PCIR_PMBASEL_1: + break; + default: + goto bar; + } + break; + } + bar: +#endif /* Reserve resources for this BAR if needed. */ rle = resource_list_find(rl, type, *rid); if (rle == NULL) { ==== //depot/projects/pci/sys/dev/pci/pci_pci.c#4 (text+ko) ==== @@ -53,6 +53,12 @@ #include "pcib_if.h" +#ifdef NEW_PCIB +#define WIN_IO 0x1 +#define WIN_MEM 0x2 +#define WIN_PMEM 0x4 +#endif + static int pcib_probe(device_t dev); static int pcib_suspend(device_t dev); static int pcib_resume(device_t dev); @@ -109,9 +115,12 @@ pcib_is_resource_managed(struct pcib_softc *sc, int type, struct resource *r) { - /* Subtractive bridges do manage resources. */ + /* XXX: Can subtractive bridges still use windows? */ +#if 0 + /* Subtractive bridges don't manage resources. */ if (sc->flags & PCIB_SUBTRACTIVE) return (0); +#endif switch (type) { case SYS_RES_IOPORT: @@ -125,7 +134,173 @@ } return (0); } -#endif + +static int +pcib_is_window_open(struct pcib_window *pw) +{ + + return (pw->base > 0 && pw->base < pw->limit); +} + +static void +pcib_alloc_window(struct pcib_softc *sc, struct pcib_window *w, int type, int reg, + int flags, const char *name, pci_addr_t max_address) +{ + int error, rid; + + if (max_address != (u_long)max_address) + max_address = ~0ul; + w->rman.rm_start = 0; + w->rman.rm_end = max_address; + w->rman.rm_type = RMAN_ARRAY; + w->rman.rm_descr = malloc(64, M_DEVBUF, M_WAITOK); + snprintf(w->rman.rm_descr, 64, "%s %s window", device_get_nameunit(sc->dev), name); + error = rman_init(&w->rman); + if (error) + panic("Failed to initialize %s %s rman", device_get_nameunit(sc->dev), + name); + + if (!pcib_is_window_open(w)) + return; + + if (w->base > max_address || w->limit > max_address) { + device_printf(sc->dev, "initial %s window has too many bits, ignoring\n", + name); + w->base = 0; + return; + } + rid = reg; + w->res = bus_alloc_resource(sc->dev, type, &rid, w->base, w->limit, w->limit - + w->base + 1, flags); + if (w->res == NULL) { + device_printf(sc->dev, "failed to allocate initial %s window: %jx - %jx\n", + name, (uintmax_t)w->base, (uintmax_t)w->limit); + w->base = 0; + return; + } + + error = rman_manage_region(&w->rman, rman_get_start(w->res), rman_get_end(w->res)); + if (error) + panic("Failed to initialize rman with resource"); +} + +/* + * Initialize I/O windows. + */ +static void +pcib_probe_windows(struct pcib_softc *sc) +{ + pci_addr_t max; + device_t dev; + uint32_t val; + int rid; + + dev = sc->dev; + + /* Determine if the I/O port window is implemented. */ + val = pci_read_config(dev, PCIR_IOBASEL_1, 1); + if (val == 0) { + /* If 'val' is zero, then only 16-bits of I/O space are supported. */ + pci_write_config(dev, PCIR_IOBASEL_1, 0xff, 1); + if (pci_read_config(dev, PCIR_IOBASEL_1, 1) != 0) { + sc->io.valid = 1; + pci_write_config(dev, PCIR_IOBASEL_1, 0, 1); + } + } else + sc->io.valid = 1; + + /* Read the existing I/O port window. */ + if (sc->io.valid) { + if ((val & PCIM_BRIO_MASK) == PCIM_BRIO_32) { + sc->io.base = PCI_PPBIOBASE( + pci_read_config(dev, PCIR_IOBASEH_1, 2), val); + sc->io.limit = PCI_PPBIOLIMIT( + pci_read_config(dev, PCIR_IOLIMITH_1, 2), + pci_read_config(dev, PCIR_IOLIMITL_1, 1)); + max = 0xffffffff; + } else { + sc->io.base = PCI_PPBIOBASE(0, val); + sc->io.limit = PCI_PPBIOLIMIT(0, + pci_read_config(dev, PCIR_IOLIMITL_1, 1)); + max = 0xffff; + } + pcib_alloc_window(sc, &sc->io, SYS_RES_IOPORT, PCIR_IOBASEL_1, 0, + "I/O port", max); + } + + /* Read the existing memory window. */ + sc->mem.valid = 1; + sc->mem.base = PCI_PPBMEMBASE(0, pci_read_config(dev, PCIR_MEMBASE_1, 2)); + sc->mem.limit = PCI_PPBMEMLIMIT(0, pci_read_config(dev, PCIR_MEMLIMIT_1, 2)); + pcib_alloc_window(sc, &sc->mem, SYS_RES_MEMORY, PCIR_MEMBASE_1, 0, "memory", + 0xffffffff); + + /* Determine if the prefetchable memory window is implemented. */ + val = pci_read_config(dev, PCIR_PMBASEL_1, 2); + if (val == 0) { + /* If 'val' is zero, then only 32-bits of memory space are supported. */ + pci_write_config(dev, PCIR_PMBASEL_1, 0xffff, 2); + if (pci_read_config(dev, PCIR_PMBASEL_1, 2) != 0) { + sc->pmem.valid = 1; + pci_write_config(dev, PCIR_PMBASEL_1, 0, 2); + } + } else + sc->pmem.valid = 1; + + /* Read the existing prefetchable memory window. */ + if (sc->pmem.valid) { + if ((val & PCIM_BRPM_MASK) == PCIM_BRPM_64) { + sc->pmem.base = PCI_PPBMEMBASE( + pci_read_config(dev, PCIR_PMBASEH_1, 4), pmemlow); + sc->pmem.limit = PCI_PPBMEMLIMIT( + pci_read_config(dev, PCIR_PMLIMITH_1, 4), + pci_read_config(dev, PCIR_PMLIMITL_1, 2)); + max = 0xffffffffffffffff; + } else { + sc->pmem.base = PCI_PPBMEMBASE(0, pmemlow); + sc->pmem.limit = PCI_PPBMEMLIMIT(0, + pci_read_config(dev, PCIR_PMLIMITL_1, 2)); + max = 0xffffffff; + } + pcib_alloc_window(sc, &sc->pmem, SYS_RES_MEMORY, PCIR_PMBASEL_1, + RF_PREFETCHABLE, "prefetchable memory", max); + } +} + +static void +pcib_write_windows(struct pcib_softc *sc, int mask) +{ + device_t dev; + uint32_t val; + + dev = sc->dev; + if (mask & WIN_IO) { + val = pci_read_config(dev, PCIR_IOBASEL_1, 1); + if ((val & PCIM_BRIO_MASK) == PCIM_BRIO_32) { + pci_write_config(dev, PCIR_IOBASEH_1, sc->io.base >> 16, 2); + pci_write_config(dev, PCIR_IOLIMITH_1, sc->io.limit >> 16, 2); + } + pci_write_config(dev, PCIR_IOBASEL_1, sc->io.base >> 8, 1); + pci_write_config(dev, PCIR_IOLIMITL_1, sc->io.limit >> 8, 1); + } + + if (mask & WIN_MEM) { + pci_write_config(dev, PCIR_MEMBASE_1, sc->mem.base >> 16, 2); + pci_write_config(dev, PCIR_MEMLIMIT_1, sc->mem.limit >> 16, 2); + } + + if (mask & WIN_PMEM) { + val = pci_read_config(dev, PCIR_PMBASEL_1, 2); + if ((val & PCIM_BRPM_MASK) == PCIM_BRPM_64) { + pci_write_config(dev, PCIR_PMBASEH_1, sc->pmem.base >> 32, 4); + pci_write_config(dev, PCIR_PMLIMITH_1, sc->pmem.limit >> 32, 4); + } + pci_write_config(dev, PCIR_PMBASEL_1, sc->pmem.base >> 16, 2); + pci_write_config(dev, PCIR_PMLIMITL_1, sc->pmem.limit >> 16, 2); + } +} + +#else /* * Is the prefetch window open (eg, can we allocate memory in it?) @@ -257,6 +432,7 @@ pci_write_config(dev, PCIR_PMLIMITH_1, pmemhi, 4); pci_write_config(dev, PCIR_PMLIMITL_1, sc->pmemlimit >> 16, 2); } +#endif /* * Get current bridge configuration. @@ -274,10 +450,12 @@ sc->subbus = pci_read_config(dev, PCIR_SUBBUS_1, 1); sc->bridgectl = pci_read_config(dev, PCIR_BRIDGECTL_1, 2); sc->seclat = pci_read_config(dev, PCIR_SECLAT_1, 1); +#ifndef NEW_PCIB if (sc->command & PCIM_CMD_PORTEN) pcib_get_io_decode(sc); if (sc->command & PCIM_CMD_MEMEN) pcib_get_mem_decode(sc); +#endif } /* @@ -296,10 +474,14 @@ pci_write_config(dev, PCIR_SUBBUS_1, sc->subbus, 1); pci_write_config(dev, PCIR_BRIDGECTL_1, sc->bridgectl, 2); pci_write_config(dev, PCIR_SECLAT_1, sc->seclat, 1); +#ifdef NEW_PCIB + pcib_write_windows(sc, WIN_IO | WIN_MEM | WIN_PMEM); +#else if (sc->command & PCIM_CMD_PORTEN) pcib_set_io_decode(sc); if (sc->command & PCIM_CMD_MEMEN) pcib_set_mem_decode(sc); +#endif } /* @@ -416,18 +598,34 @@ if ((pci_get_devid(dev) & 0xff00ffff) == 0x24008086 || pci_read_config(dev, PCIR_PROGIF, 1) == PCIP_BRIDGE_PCI_SUBTRACTIVE) sc->flags |= PCIB_SUBTRACTIVE; - + +#ifdef NEW_PCIB + pcib_probe_windows(); +#endif if (bootverbose) { device_printf(dev, " domain %d\n", sc->domain); device_printf(dev, " secondary bus %d\n", sc->secbus); device_printf(dev, " subordinate bus %d\n", sc->subbus); - device_printf(dev, " I/O decode 0x%x-0x%x\n", sc->iobase, sc->iolimit); +#ifdef NEW_PCIB + if (pcib_is_window_open(&sc->io) + device_printf(dev, " I/O decode 0x%jx-0x%jx\n", + (uintmax_t)sc->io.base, (uintmax_t)sc->io.limit); + if (pcib_is_window_open(&sc->mem)) + device_printf(dev, " memory decode 0x%jx-0x%jx\n", + (uintmax_t)sc->mem.base, (uintmax_t)sc->mem.limit); + if (pcib_is_window_open(&sc->pmem)) + device_printf(dev, " prefetched decode 0x%jx-0x%jx\n", + (uintmax_t)sc->pmem.base, (uintmax_t)sc->pmem.limit); +#else + if (pcib_is_io_open(sc)) + device_printf(dev, " I/O decode 0x%x-0x%x\n", sc->iobase, sc->iolimit); if (pcib_is_nonprefetch_open(sc)) device_printf(dev, " memory decode 0x%jx-0x%jx\n", (uintmax_t)sc->membase, (uintmax_t)sc->memlimit); if (pcib_is_prefetch_open(sc)) device_printf(dev, " prefetched decode 0x%jx-0x%jx\n", (uintmax_t)sc->pmembase, (uintmax_t)sc->pmemlimit); +#endif else device_printf(dev, " no prefetched decode\n"); if (sc->flags & PCIB_SUBTRACTIVE) @@ -529,7 +727,48 @@ return(ENOENT); } +#ifdef NEW_PCIB /* + * Attempt to allocate a resource from the existing resources assigned to a window. + */ +static struct resource * +pcib_suballoc_resource(struct pcib_softc *sc, struct pcib_window *w, device_t child, + int type, int *rid, u_long start, u_long end, u_long count, u_int flags) +{ + struct resource *res; + + if (!pcib_is_window_open(w)) + return (NULL); + + res = rman_reserve_resource(&w->rm, start, end, count, flags & ~RF_ACTIVE, + child); + if (res == NULL) + return (NULL); + + rman_set_rid(res, *rid); + + /* + * If the resource should be active, pass that request up the + * tree. This assumes the parent drivers can handle + * activating sub-allocated resources. + */ + if (flags & RF_ACTIVE) { + if (bus_activate_resource(child, type, *rid, res) != 0) { + rman_release_resource(res); + return (NULL); + } + } + + return (res); +} + +/* + * Attempt to grow a window to make room for a given resource request. + */ +static int +pcib_grow_window(struct pcib_softc *sc, struct pcib_window *w + +/* * We have to trap resource allocation requests and ensure that the bridge * is set up to, or capable of handling them. */ @@ -537,6 +776,21 @@ pcib_alloc_resource(device_t dev, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) { + struct pcib_softc *sc; + + sc = device_get_softc(dev); + switch (type) { + + +#else +/* + * We have to trap resource allocation requests and ensure that the bridge + * is set up to, or capable of handling them. + */ +struct resource * +pcib_alloc_resource(device_t dev, device_t child, int type, int *rid, + u_long start, u_long end, u_long count, u_int flags) +{ struct pcib_softc *sc = device_get_softc(dev); const char *name, *suffix; int ok; @@ -684,6 +938,7 @@ return (bus_generic_alloc_resource(dev, child, type, rid, start, end, count, flags)); } +#endif int pcib_adjust_resource(device_t bus, device_t child, int type, struct resource *r, ==== //depot/projects/pci/sys/dev/pci/pcib_private.h#4 (text+ko) ==== @@ -39,6 +39,16 @@ */ DECLARE_CLASS(pcib_driver); +#ifdef NEW_PCIB +struct pcib_window { + pci_addr_t base; + pci_addr_t limit; + struct rman rman; + struct resource *res; + int valid; +}; +#endif + /* * Bridge-specific data. */ @@ -54,16 +64,18 @@ u_int secbus; /* secondary bus number */ u_int subbus; /* subordinate bus number */ #ifdef NEW_PCIB - struct rman pmem_rman; /* prefetchable memory window */ - struct rman mem_rman; /* memory window */ - struct rman io_rman; /* I/O port window */ -#endif + u_int valid_windows; + struct pcib_window pmem; /* prefetchable memory window */ + struct pcib_window mem; /* memory window */ + struct pcib_window io; /* I/O port window */ +#else pci_addr_t pmembase; /* base address of prefetchable memory */ pci_addr_t pmemlimit; /* topmost address of prefetchable memory */ pci_addr_t membase; /* base address of memory window */ pci_addr_t memlimit; /* topmost address of memory window */ uint32_t iobase; /* base address of port window */ uint32_t iolimit; /* topmost address of port window */ +#endif uint16_t secstat; /* secondary bus status register */ uint16_t bridgectl; /* bridge control register */ uint8_t seclat; /* secondary bus latency timer */ From owner-p4-projects@FreeBSD.ORG Mon Apr 4 13:27:23 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6377A106566C; Mon, 4 Apr 2011 13:27:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 264AB1065672 for ; Mon, 4 Apr 2011 13:27:23 +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 115028FC13 for ; Mon, 4 Apr 2011 13:27: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 p34DRMfr068933 for ; Mon, 4 Apr 2011 13:27:22 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p34DRMrh068930 for perforce@freebsd.org; Mon, 4 Apr 2011 13:27:22 GMT (envelope-from jhb@freebsd.org) Date: Mon, 4 Apr 2011 13:27:22 GMT Message-Id: <201104041327.p34DRMrh068930@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 191022 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, 04 Apr 2011 13:27:23 -0000 http://p4web.freebsd.org/@@191022?ac=10 Change 191022 by jhb@jhb_jhbbsd on 2011/04/04 13:26:40 Cleanups, fully handle the 'valid' member of pcib_window. Affected files ... .. //depot/projects/pci/sys/dev/pci/pci_pci.c#5 edit Differences ... ==== //depot/projects/pci/sys/dev/pci/pci_pci.c#5 (text+ko) ==== @@ -139,12 +139,12 @@ pcib_is_window_open(struct pcib_window *pw) { - return (pw->base > 0 && pw->base < pw->limit); + return (pw->valid && pw->base < pw->limit); } static void -pcib_alloc_window(struct pcib_softc *sc, struct pcib_window *w, int type, int reg, - int flags, const char *name, pci_addr_t max_address) +pcib_alloc_window(struct pcib_softc *sc, struct pcib_window *w, int type, + int reg, int flags, const char *name, pci_addr_t max_address) { int error, rid; @@ -154,32 +154,33 @@ w->rman.rm_end = max_address; w->rman.rm_type = RMAN_ARRAY; w->rman.rm_descr = malloc(64, M_DEVBUF, M_WAITOK); - snprintf(w->rman.rm_descr, 64, "%s %s window", device_get_nameunit(sc->dev), name); + snprintf(w->rman.rm_descr, 64, "%s %s window", + device_get_nameunit(sc->dev), name); error = rman_init(&w->rman); if (error) - panic("Failed to initialize %s %s rman", device_get_nameunit(sc->dev), - name); + panic("Failed to initialize %s %s rman", + device_get_nameunit(sc->dev), name); if (!pcib_is_window_open(w)) return; if (w->base > max_address || w->limit > max_address) { - device_printf(sc->dev, "initial %s window has too many bits, ignoring\n", - name); - w->base = 0; + device_printf(sc->dev, + "initial %s window has too many bits, ignoring\n", name); return; } rid = reg; - w->res = bus_alloc_resource(sc->dev, type, &rid, w->base, w->limit, w->limit - - w->base + 1, flags); + w->res = bus_alloc_resource(sc->dev, type, &rid, w->base, w->limit, + w->limit - w->base + 1, flags); if (w->res == NULL) { - device_printf(sc->dev, "failed to allocate initial %s window: %jx - %jx\n", + device_printf(sc->dev, + "failed to allocate initial %s window: %jx - %jx\n", name, (uintmax_t)w->base, (uintmax_t)w->limit); - w->base = 0; return; } - error = rman_manage_region(&w->rman, rman_get_start(w->res), rman_get_end(w->res)); + error = rman_manage_region(&w->rman, rman_get_start(w->res), + rman_get_end(w->res)); if (error) panic("Failed to initialize rman with resource"); } @@ -200,7 +201,10 @@ /* Determine if the I/O port window is implemented. */ val = pci_read_config(dev, PCIR_IOBASEL_1, 1); if (val == 0) { - /* If 'val' is zero, then only 16-bits of I/O space are supported. */ + /* + * If 'val' is zero, then only 16-bits of I/O space + * are supported. + */ pci_write_config(dev, PCIR_IOBASEL_1, 0xff, 1); if (pci_read_config(dev, PCIR_IOBASEL_1, 1) != 0) { sc->io.valid = 1; @@ -224,21 +228,26 @@ pci_read_config(dev, PCIR_IOLIMITL_1, 1)); max = 0xffff; } - pcib_alloc_window(sc, &sc->io, SYS_RES_IOPORT, PCIR_IOBASEL_1, 0, - "I/O port", max); + pcib_alloc_window(sc, &sc->io, SYS_RES_IOPORT, PCIR_IOBASEL_1, + 0, "I/O port", max); } /* Read the existing memory window. */ sc->mem.valid = 1; - sc->mem.base = PCI_PPBMEMBASE(0, pci_read_config(dev, PCIR_MEMBASE_1, 2)); - sc->mem.limit = PCI_PPBMEMLIMIT(0, pci_read_config(dev, PCIR_MEMLIMIT_1, 2)); - pcib_alloc_window(sc, &sc->mem, SYS_RES_MEMORY, PCIR_MEMBASE_1, 0, "memory", - 0xffffffff); + sc->mem.base = PCI_PPBMEMBASE(0, + pci_read_config(dev, PCIR_MEMBASE_1, 2)); + sc->mem.limit = PCI_PPBMEMLIMIT(0, + pci_read_config(dev, PCIR_MEMLIMIT_1, 2)); + pcib_alloc_window(sc, &sc->mem, SYS_RES_MEMORY, PCIR_MEMBASE_1, 0, + "memory", 0xffffffff); /* Determine if the prefetchable memory window is implemented. */ val = pci_read_config(dev, PCIR_PMBASEL_1, 2); if (val == 0) { - /* If 'val' is zero, then only 32-bits of memory space are supported. */ + /* + * If 'val' is zero, then only 32-bits of memory space + * are supported. + */ pci_write_config(dev, PCIR_PMBASEL_1, 0xffff, 2); if (pci_read_config(dev, PCIR_PMBASEL_1, 2) != 0) { sc->pmem.valid = 1; @@ -274,11 +283,13 @@ uint32_t val; dev = sc->dev; - if (mask & WIN_IO) { + if (sc->io.valid && mask & WIN_IO) { val = pci_read_config(dev, PCIR_IOBASEL_1, 1); if ((val & PCIM_BRIO_MASK) == PCIM_BRIO_32) { - pci_write_config(dev, PCIR_IOBASEH_1, sc->io.base >> 16, 2); - pci_write_config(dev, PCIR_IOLIMITH_1, sc->io.limit >> 16, 2); + pci_write_config(dev, PCIR_IOBASEH_1, + sc->io.base >> 16, 2); + pci_write_config(dev, PCIR_IOLIMITH_1, + sc->io.limit >> 16, 2); } pci_write_config(dev, PCIR_IOBASEL_1, sc->io.base >> 8, 1); pci_write_config(dev, PCIR_IOLIMITL_1, sc->io.limit >> 8, 1); @@ -289,11 +300,13 @@ pci_write_config(dev, PCIR_MEMLIMIT_1, sc->mem.limit >> 16, 2); } - if (mask & WIN_PMEM) { + if (sc->pmem.valid && mask & WIN_PMEM) { val = pci_read_config(dev, PCIR_PMBASEL_1, 2); if ((val & PCIM_BRPM_MASK) == PCIM_BRPM_64) { - pci_write_config(dev, PCIR_PMBASEH_1, sc->pmem.base >> 32, 4); - pci_write_config(dev, PCIR_PMLIMITH_1, sc->pmem.limit >> 32, 4); + pci_write_config(dev, PCIR_PMBASEH_1, + sc->pmem.base >> 32, 4); + pci_write_config(dev, PCIR_PMLIMITH_1, + sc->pmem.limit >> 32, 4); } pci_write_config(dev, PCIR_PMBASEL_1, sc->pmem.base >> 16, 2); pci_write_config(dev, PCIR_PMLIMITL_1, sc->pmem.limit >> 16, 2); @@ -607,7 +620,7 @@ device_printf(dev, " secondary bus %d\n", sc->secbus); device_printf(dev, " subordinate bus %d\n", sc->subbus); #ifdef NEW_PCIB - if (pcib_is_window_open(&sc->io) + if (pcib_is_window_open(&sc->io)) device_printf(dev, " I/O decode 0x%jx-0x%jx\n", (uintmax_t)sc->io.base, (uintmax_t)sc->io.limit); if (pcib_is_window_open(&sc->mem)) @@ -618,7 +631,8 @@ (uintmax_t)sc->pmem.base, (uintmax_t)sc->pmem.limit); #else if (pcib_is_io_open(sc)) - device_printf(dev, " I/O decode 0x%x-0x%x\n", sc->iobase, sc->iolimit); + device_printf(dev, " I/O decode 0x%x-0x%x\n", + sc->iobase, sc->iolimit); if (pcib_is_nonprefetch_open(sc)) device_printf(dev, " memory decode 0x%jx-0x%jx\n", (uintmax_t)sc->membase, (uintmax_t)sc->memlimit); @@ -729,19 +743,21 @@ #ifdef NEW_PCIB /* - * Attempt to allocate a resource from the existing resources assigned to a window. + * Attempt to allocate a resource from the existing resources assigned + * to a window. */ static struct resource * -pcib_suballoc_resource(struct pcib_softc *sc, struct pcib_window *w, device_t child, - int type, int *rid, u_long start, u_long end, u_long count, u_int flags) +pcib_suballoc_resource(struct pcib_softc *sc, struct pcib_window *w, + device_t child, int type, int *rid, u_long start, u_long end, u_long count, + u_int flags) { struct resource *res; if (!pcib_is_window_open(w)) return (NULL); - res = rman_reserve_resource(&w->rm, start, end, count, flags & ~RF_ACTIVE, - child); + res = rman_reserve_resource(&w->rm, start, end, count, + flags & ~RF_ACTIVE, child); if (res == NULL) return (NULL); From owner-p4-projects@FreeBSD.ORG Mon Apr 4 15:33:44 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8790A1065676; Mon, 4 Apr 2011 15:33:44 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 498D81065674 for ; Mon, 4 Apr 2011 15:33:44 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 35AF18FC08 for ; Mon, 4 Apr 2011 15:33:44 +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 p34FXim6093193 for ; Mon, 4 Apr 2011 15:33:44 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p34FXhST093190 for perforce@freebsd.org; Mon, 4 Apr 2011 15:33:43 GMT (envelope-from trasz@freebsd.org) Date: Mon, 4 Apr 2011 15:33:43 GMT Message-Id: <201104041533.p34FXhST093190@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 191029 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, 04 Apr 2011 15:33:44 -0000 http://p4web.freebsd.org/@@191029?ac=10 Change 191029 by trasz@trasz_victim on 2011/04/04 15:33:33 IFC. Affected files ... .. //depot/projects/soc2009/trasz_limits/Makefile.inc1#24 integrate .. //depot/projects/soc2009/trasz_limits/contrib/tzdata/africa#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/tzdata/asia#6 integrate .. //depot/projects/soc2009/trasz_limits/contrib/tzdata/europe#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/tzdata/southamerica#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/tzdata/zone.tab#8 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/sys/open.2#5 integrate .. //depot/projects/soc2009/trasz_limits/sbin/ggate/ggatel/ggatel.8#2 integrate .. //depot/projects/soc2009/trasz_limits/sbin/ggate/ggatel/ggatel.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sbin/hastd/hast.conf.5#10 integrate .. //depot/projects/soc2009/trasz_limits/sbin/hastd/hast.h#10 integrate .. //depot/projects/soc2009/trasz_limits/sbin/hastd/primary.c#16 integrate .. //depot/projects/soc2009/trasz_limits/sbin/hastd/proto_common.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sbin/hastd/secondary.c#12 integrate .. //depot/projects/soc2009/trasz_limits/share/examples/Makefile#8 integrate .. //depot/projects/soc2009/trasz_limits/share/examples/kld/firmware/fwimage/Makefile#3 integrate .. //depot/projects/soc2009/trasz_limits/share/examples/kld/firmware/fwimage/firmware.img.in#2 delete .. //depot/projects/soc2009/trasz_limits/share/examples/kld/firmware/fwimage/firmware.img.uu#1 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/ARABIC%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/CELTIC%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/CENTEURO%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/CROATIAN%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/CYRILLIC%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/DEVANAGA%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/DINGBATS%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/FARSI%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/GAELIC%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/GREEK%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/GUJARATI%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/GURMUKHI%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/HEBREW%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/ICELAND%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/INUIT%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/KEYBOARD%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/ROMAN%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/ROMANIAN%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/SYMBOL%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/THAI%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/TURKISH%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25ARABIC.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25CELTIC.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25CENTEURO.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25CROATIAN.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25CYRILLIC.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25DEVANAGA.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25DINGBATS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25FARSI.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25GAELIC.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25GREEK.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25GUJARATI.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25GURMUKHI.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25HEBREW.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25ICELAND.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25INUIT.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25KEYBOARD.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25ROMAN.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25ROMANIAN.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25SYMBOL.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25THAI.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25TURKISH.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/AST/ARMSCII-7%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/AST/ARMSCII-8%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/AST/ARMSCII-8A%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/AST/UCS%25ARMSCII-7.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/AST/UCS%25ARMSCII-8.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/AST/UCS%25ARMSCII-8A.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/BIG5/Big5UDA%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/BIG5/UCS%25Big5UDA.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CNS/CNS11643-1%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CNS/CNS11643-2%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CNS/UCS%25CNS11643-1.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CNS/UCS%25CNS11643-2.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP037%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP038%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP10000%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP10006%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP10007%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP10029%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1006%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP10079%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP10081%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1026%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1046%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1124%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1125%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1129%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1131%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1133%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1161%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1162%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1163%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1250%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1251%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1252%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1253%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1254%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1255%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1256%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1257%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1258%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP273%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP274%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP275%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP277%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP278%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP280%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP281%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP284%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP285%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP290%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP297%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP420%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP423%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP424%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP437%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP500%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP737%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP775%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP850%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP851%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP852%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP853%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP855%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP856%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP857%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP858%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP860%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP861%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP862%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP863%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP864%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP865%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP866%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP868%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP869%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP870%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP871%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP874%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP875%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP880%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP891%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP903%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP904%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP905%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP918%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP922%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP932UDA%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP936EXT%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP942EXT%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP949EXT%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP950%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP037.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP038.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP10000.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP10006.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP10007.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP10029.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1006.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP10079.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP10081.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1026.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1046.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1124.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1125.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1129.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1131.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1133.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1161.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1162.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1163.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1250.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1251.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1252.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1253.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1254.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1255.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1256.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1257.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1258.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP273.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP274.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP275.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP277.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP278.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP280.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP281.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP284.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP285.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP290.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP297.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP420.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP423.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP424.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP437.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP500.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP737.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP775.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP850.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP851.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP852.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP853.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP855.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP856.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP857.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP858.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP860.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP861.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP862.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP863.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP864.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP865.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP866.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP868.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP869.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP870.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP871.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP874.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP875.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP880.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP891.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP903.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP904.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP905.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP918.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP922.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP932UDA.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP936EXT.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP942EXT.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP949EXT.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP950.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-AT-DE%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-AT-DE-A%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-CA-FR%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-DK-NO%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-DK-NO-A%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-ES%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-ES-A%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-ES-S%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-FI-SE%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-FI-SE-A%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-FR%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-IT%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-PT%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-UK%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-AT-DE-A.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-AT-DE.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-CA-FR.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-DK-NO-A.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-DK-NO.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-ES-A.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-ES-S.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-ES.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-FI-SE-A.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-FI-SE.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-FR.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-IT.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-PT.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-UK.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/GB12345%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/GB2312%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/GB2312EXT%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/GB2312GBK%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/GB2312UDA1%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/GB2312UDA2%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/GBKEXT%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/GBKUDA%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/ISO-IR-165EXT%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/UCS%25GB12345.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/UCS%25GB2312.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/UCS%25GB2312EXT.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/UCS%25GB2312UDA1.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/UCS%25GB2312UDA2.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/UCS%25GBKEXT.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/UCS%25GBKUDA.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/UCS%25ISO-IR-165EXT.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GEORGIAN/GEORGIAN-ACADEMY%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GEORGIAN/GEORGIAN-PS%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GEORGIAN/UCS%25GEORGIAN-ACADEMY.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GEORGIAN/UCS%25GEORGIAN-PS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-10%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-11%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-13%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-14%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-15%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-16%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-2%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-3%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-4%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-5%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-6%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-7%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-8%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-9%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-10.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-11.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-13.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-14.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-15.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-16.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-2.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-3.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-4.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-5.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-6.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-7.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-8.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-9.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-CA%25UCS.646#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-CA2%25UCS.646#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-CN%25UCS.646#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-CU%25UCS.646#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-DE%25UCS.646#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-DK%25UCS.646#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-ES%25UCS.646#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-ES2%25UCS.646#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-FI%25UCS.646#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-FR%25UCS.646#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-FR1%25UCS.646#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-GB%25UCS.646#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-HU%25UCS.646#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-IT%25UCS.646#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-JP%25UCS.646#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-JP-OCR-B%25UCS.646#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-KR%25UCS.646#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-NO%25UCS.646#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-NO2%25UCS.646#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-PT%25UCS.646#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-PT2%25UCS.646#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-SE%25UCS.646#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-SE2%25UCS.646#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-US%25UCS.646#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-YU%25UCS.646#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/JIS/JISX0201-KANA%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/JIS/JISX0208UDC%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/JIS/JISX0212%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/JIS/JISX0212UDC%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/JIS/UCS%25JISX0201-KANA.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/JIS/UCS%25JISX0208UDC.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/JIS/UCS%25JISX0212.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/JIS/UCS%25JISX0212UDC.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KAZAKH/KZ1048%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KAZAKH/PTCP154%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KAZAKH/UCS%25KZ1048.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KAZAKH/UCS%25PTCP154.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/GOST19768-74%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/ISO-5427%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/KOI7%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/KOI8%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/KOI8-C%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/KOI8-CyrillicOld%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/KOI8-E%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/KOI8-R%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/KOI8-RU%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/KOI8-T%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/KOI8-U%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25GOST19768-74.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25ISO-5427.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25KOI7.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25KOI8-C.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25KOI8-CyrillicOld.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25KOI8-E.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25KOI8-R.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25KOI8-RU.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25KOI8-T.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25KOI8-U.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25KOI8.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KS/JOHAB%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KS/KSC5601HANGUL%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KS/KSC5601HANJA%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KS/UCS%25JOHAB.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KS/UCS%25KSC5601HANGUL.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KS/UCS%25KSC5601HANJA.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/ATARIST%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/DECMCS%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/HP-ROMAN8%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/MULELAO-1%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/NEXTSTEP%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/RISCOS-LATIN1%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/TDS565%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/UCS%25ATARIST.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/UCS%25DECMCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/UCS%25HP-ROMAN8.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/UCS%25MULELAO-1.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/UCS%25NEXTSTEP.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/UCS%25RISCOS-LATIN1.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/UCS%25TDS565.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/TCVN/TCVN5712-1%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/TCVN/UCS%25TCVN5712-1.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/TCVN/UCS%25VISCII.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/TCVN/VISCII%25UCS.src#8 branch .. //depot/projects/soc2009/trasz_limits/share/man/man4/cc_chd.4#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/man4.i386/ep.4#3 integrate .. //depot/projects/soc2009/trasz_limits/share/misc/committers-src.dot#20 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/ia32/ia32_misc.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/ia32/ia32_signal.c#15 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/ia32/ia32_sigtramp.S#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/ia32/ia32_syscall.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/arm/econa/ehci_ebus.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/boot/common/bootstrap.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/boot/ia64/ski/efi_stub.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/boot/ia64/ski/skimd.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/boot/sparc64/loader/main.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32_ioctl.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32_ioctl.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32_misc.c#18 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32_proto.h#17 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32_syscall.h#15 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32_syscalls.c#15 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32_sysent.c#16 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/syscalls.master#21 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/ia32/ia32_genassym.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/ia32/ia32_signal.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/ia32/ia32_sysvec.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/ia32/ia32_util.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/NOTES#39 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/files.mips#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/age/if_age.c#12 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ah.c#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ah_internal.h#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar5416/ar2133.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar5416/ar5416.h#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar5416/ar5416_recv.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#16 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar9001/ar9160.ini#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/bxe/if_bxe.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/bxe/if_bxe.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/cxgbe/common/common.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/cxgbe/common/t4fw_interface.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/cxgbe/t4_main.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/e1000/if_em.c#25 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/e1000/if_em.h#12 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/nvram2env/nvram2env.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/streams/streams.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/ehci_ixp4xx.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/ehci_mv.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/ehci_pci.c#13 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_generic.c#15 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_pf.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_pf.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_transfer.c#21 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usbdi.h#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/wlan/if_run.c#13 integrate .. //depot/projects/soc2009/trasz_limits/sys/geom/eli/g_eli.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/geom/gate/g_gate.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/ia64/ia32/ia32_misc.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/ia64/ia32/ia32_signal.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/imgact_aout.c#16 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_descrip.c#25 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_event.c#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/sys_pipe.c#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/tty_pts.c#27 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/uipc_mqueue.c#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/uipc_sem.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/uipc_shm.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/uipc_syscalls.c#20 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/vfs_syscalls.c#17 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/atheros/ar71xx_ehci.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/atheros/if_arge.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/conf/AR91XX_BASE#1 branch .. //depot/projects/soc2009/trasz_limits/sys/mips/conf/AR91XX_BASE.hints#1 branch .. //depot/projects/soc2009/trasz_limits/sys/mips/conf/RT305X#1 branch .. //depot/projects/soc2009/trasz_limits/sys/mips/conf/RT305X.hints#1 branch .. //depot/projects/soc2009/trasz_limits/sys/mips/conf/TP-WN1043ND#1 branch .. //depot/projects/soc2009/trasz_limits/sys/mips/conf/TP-WN1043ND.hints#1 branch .. //depot/projects/soc2009/trasz_limits/sys/mips/rmi/xls_ehci.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/rt305x/files.rt305x#1 branch .. //depot/projects/soc2009/trasz_limits/sys/mips/rt305x/obio.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/mips/rt305x/obiovar.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/mips/rt305x/rt305x_dotg.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/mips/rt305x/rt305x_gpio.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/mips/rt305x/rt305x_gpio.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/mips/rt305x/rt305x_gpiovar.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/mips/rt305x/rt305x_ic.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/mips/rt305x/rt305x_icvar.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/mips/rt305x/rt305x_machdep.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/mips/rt305x/rt305x_sysctl.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/mips/rt305x/rt305x_sysctlvar.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/mips/rt305x/rt305xreg.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/mips/rt305x/rt_swreg.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/mips/rt305x/std.rt305x#1 branch .. //depot/projects/soc2009/trasz_limits/sys/mips/rt305x/uart_bus_rt305x.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/mips/rt305x/uart_cpu_rt305x.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/mips/rt305x/uart_dev_rt305x.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/mips/rt305x/uart_dev_rt305x.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/modules/Makefile#32 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/ath_pci/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/cxgbe/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/cxgbe/if_cxgbe/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/sys/netipsec/xform_ipcomp.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/opencrypto/cryptodev.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/filedesc.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/syscallsubr.h#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/tools/fw_stub.awk#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/ufs/ffs/ffs_softdep.c#19 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/man/man.sh#5 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/usbdump/usbdump.c#4 integrate Differences ... ==== //depot/projects/soc2009/trasz_limits/Makefile.inc1#24 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.689 2011/03/21 09:58:24 jeff Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.690 2011/04/01 20:59:23 uqs Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -1355,10 +1355,16 @@ @echo ">>> Removing old files (only deletes safe to delete libs)" # Ask for every old file if the user really wants to remove it. # It's annoying, but better safe than sorry. - @for file in ${OLD_FILES} ${OLD_FILES:Musr/share/*.gz:R}; do \ +# NB: We cannot pass the list of OLD_FILES as a parameter because the +# argument list will get too long. Using .for/.endfor make "loops" will make +# the Makefile parser segfault. + @exec 3<&0; \ + ${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \ + -V OLD_FILES -V "OLD_FILES:Musr/share/*.gz:R" | xargs -n1 | \ + while read file; do \ if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \ chflags noschg "${DESTDIR}/$${file}" 2>/dev/null || true; \ - rm ${RM_I} "${DESTDIR}/$${file}"; \ + rm ${RM_I} "${DESTDIR}/$${file}" <&3; \ fi; \ done # Remove catpages without corresponding manpages. @@ -1368,14 +1374,16 @@ while read catpage; do \ read manpage; \ if [ ! -e "$${manpage}" ]; then \ - rm ${RM_I} $${catpage} <&3 ; \ + rm ${RM_I} $${catpage} <&3; \ fi; \ done @echo ">>> Old files removed" check-old-files: @echo ">>> Checking for old files" - @for file in ${OLD_FILES} ${OLD_FILES:Musr/share/*.gz:R}; do \ + @${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \ + -V OLD_FILES -V "OLD_FILES:Musr/share/*.gz:R" | xargs -n1 | \ + while read file; do \ if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \ echo "${DESTDIR}/$${file}"; \ fi; \ @@ -1386,24 +1394,29 @@ while read catpage; do \ read manpage; \ if [ ! -e "$${manpage}" ]; then \ - echo $${catpage} ; \ + echo $${catpage}; \ fi; \ done delete-old-libs: @echo ">>> Removing old libraries" @echo "${OLD_LIBS_MESSAGE}" | fmt - @for file in ${OLD_LIBS}; do \ + @exec 3<&0; \ + ${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \ + -V OLD_LIBS | xargs -n1 | \ + while read file; do \ if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \ chflags noschg "${DESTDIR}/$${file}" 2>/dev/null || true; \ - rm ${RM_I} "${DESTDIR}/$${file}"; \ + rm ${RM_I} "${DESTDIR}/$${file}" <&3; \ fi; \ done @echo ">>> Old libraries removed" check-old-libs: @echo ">>> Checking for old libraries" - @for file in ${OLD_LIBS}; do \ + @${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \ + -V OLD_LIBS | xargs -n1 | \ + while read file; do \ if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \ echo "${DESTDIR}/$${file}"; \ fi; \ @@ -1411,7 +1424,9 @@ delete-old-dirs: @echo ">>> Removing old directories" - @for dir in ${OLD_DIRS}; do \ + @${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \ + -V OLD_DIRS | xargs -n1 | \ + while read dir; do \ if [ -d "${DESTDIR}/$${dir}" ]; then \ rmdir -v "${DESTDIR}/$${dir}" || true; \ elif [ -L "${DESTDIR}/$${dir}" ]; then \ @@ -1422,7 +1437,9 @@ check-old-dirs: @echo ">>> Checking for old directories" - @for dir in ${OLD_DIRS}; do \ + @${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \ + -V OLD_DIRS | xargs -n1 | \ + while read dir; do \ if [ -d "${DESTDIR}/$${dir}" ]; then \ echo "${DESTDIR}/$${dir}"; \ elif [ -L "${DESTDIR}/$${dir}" ]; then \ ==== //depot/projects/soc2009/trasz_limits/contrib/tzdata/africa#5 (text+ko) ==== @@ -1,5 +1,5 @@ # 
-# @(#)africa	8.28
+# @(#)africa	8.30
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -712,6 +712,48 @@
 # http://www.timeanddate.com/news/time/morocco-starts-dst-2010.html
 # 
 
+# From Dan Abitol (2011-03-30):
+# ...Rules for Africa/Casablanca are the following (24h format)
+# The 3rd april 2011 at 00:00:00, [it] will be 3rd april 1:00:00
+# The 31th july 2011 at 00:59:59,  [it] will be 31th July 00:00:00
+# ...Official links of change in morocco
+# The change was broadcast on the FM Radio
+# I ve called ANRT (telecom regulations in Morocco) at
+# +212.537.71.84.00
+# 
+# http://www.anrt.net.ma/fr/
+# 
+# They said that
+# 
+# http://www.map.ma/fr/sections/accueil/l_heure_legale_au_ma/view
+# 
+# is the official publication to look at.
+# They said that the decision was already taken.
+#
+# More articles in the press
+# 
+# http://www.yabiladi.com/articles/details/5058/secret-l-heure-d-ete-maroc-lev
+# 
+# e.html
+# 
+# http://www.lematin.ma/Actualite/Express/Article.asp?id=148923
+# 
+# 
+# http://www.lavieeco.com/actualite/Le-Maroc-passe-sur-GMT%2B1-a-partir-de-dim
+# anche-prochain-5538.html
+# 
+
+# From Petr Machata (2011-03-30):
+# They have it written in English here:
+# 
+# http://www.map.ma/eng/sections/home/morocco_to_spring_fo/view
+# 
+#
+# It says there that "Morocco will resume its standard time on July 31,
+# 2011 at midnight." Now they don't say whether they mean midnight of
+# wall clock time (i.e. 11pm UTC), but that's what I would assume. It has
+# also been like that in the past.
+
 # RULE	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 
 Rule	Morocco	1939	only	-	Sep	12	 0:00	1:00	S
@@ -735,6 +777,8 @@
 Rule	Morocco	2009	only	-	Aug	 21	 0:00	0	-
 Rule	Morocco	2010	only	-	May	 2	 0:00	1:00	S
 Rule	Morocco	2010	only	-	Aug	 8	 0:00	0	-
+Rule	Morocco	2011	only	-	Apr	 3	 0:00	1:00	S
+Rule	Morocco	2011	only	-	Jul	 31	 0	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Africa/Casablanca	-0:30:20 -	LMT	1913 Oct 26
 			 0:00	Morocco	WE%sT	1984 Mar 16

==== //depot/projects/soc2009/trasz_limits/contrib/tzdata/asia#6 (text+ko) ====

@@ -1,4 +1,4 @@
-# @(#)asia	8.62
+# @(#)asia	8.64
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 

==== //depot/projects/soc2009/trasz_limits/contrib/tzdata/europe#5 (text+ko) ====

@@ -1,5 +1,5 @@
 # 
-# @(#)europe	8.28
+# @(#)europe	8.31
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 

==== //depot/projects/soc2009/trasz_limits/contrib/tzdata/southamerica#4 (text+ko) ====

@@ -1,5 +1,5 @@
 # 
-# @(#)southamerica	8.45
+# @(#)southamerica	8.47
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -1171,6 +1171,19 @@
 # From Arthur David Olson (2011-03-02):
 # The emol.com article mentions a water shortage as the cause of the
 # postponement, which may mean that it's not a permanent change.
+
+# From Glenn Eychaner (2011-03-28):
+# The article:
+# 
+# http://diario.elmercurio.com/2011/03/28/_portada/_portada/noticias/7565897A-CA86-49E6-9E03-660B21A4883E.htm?id=3D{7565897A-CA86-49E6-9E03-660B21A4883E}
+# 
+#
+# In English:
+# Chile's clocks will go back an hour this year on the 7th of May instead
+# of this Saturday. They will go forward again the 3rd Saturday in
+# August, not in October as they have since 1968. This is a pilot plan
+# which will be reevaluated in 2012.
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Chile	1927	1932	-	Sep	 1	0:00	1:00	S
 Rule	Chile	1928	1932	-	Apr	 1	0:00	0	-
@@ -1200,13 +1213,16 @@
 Rule	Chile	1998	only	-	Mar	Sun>=9	3:00u	0	-
 Rule	Chile	1998	only	-	Sep	27	4:00u	1:00	S
 Rule	Chile	1999	only	-	Apr	 4	3:00u	0	-
-Rule	Chile	1999	max	-	Oct	Sun>=9	4:00u	1:00	S
+Rule	Chile	1999	2010	-	Oct	Sun>=9	4:00u	1:00	S
+Rule	Chile	2011	only	-	Aug	Sun>=16	4:00u	1:00	S
+Rule	Chile	2012	max	-	Oct	Sun>=9	4:00u	1:00	S
 Rule	Chile	2000	2007	-	Mar	Sun>=9	3:00u	0	-
 # N.B.: the end of March 29 in Chile is March 30 in Universal time,
 # which is used below in specifying the transition.
 Rule	Chile	2008	only	-	Mar	30	3:00u	0	-
 Rule	Chile	2009	only	-	Mar	Sun>=9	3:00u	0	-
-Rule	Chile	2010	2011	-	Apr	Sun>=1	3:00u	0	-
+Rule	Chile	2010	only	-	Apr	Sun>=1	3:00u	0	-
+Rule	Chile	2011	only	-	May	Sun>=2	3:00u	0	-
 Rule	Chile	2012	max	-	Mar	Sun>=9	3:00u	0	-
 # IATA SSIM anomalies: (1992-02) says 1992-03-14;
 # (1996-09) says 1998-03-08.  Ignore these.

==== //depot/projects/soc2009/trasz_limits/contrib/tzdata/zone.tab#8 (text+ko) ====

@@ -1,5 +1,5 @@
 # 
-# @(#)zone.tab	8.41
+# @(#)zone.tab	8.43
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 #

==== //depot/projects/soc2009/trasz_limits/lib/libc/sys/open.2#5 (text+ko) ====

@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)open.2	8.2 (Berkeley) 11/16/93
-.\" $FreeBSD: src/lib/libc/sys/open.2,v 1.43 2011/03/25 14:01:18 kib Exp $
+.\" $FreeBSD: src/lib/libc/sys/open.2,v 1.44 2011/04/01 19:57:27 kib Exp $
 .\"
 .Dd March 25, 2011
 .Dt OPEN 2
@@ -248,8 +248,7 @@
 which contains it.
 .Pp
 Unless
-.Dv
-O_CLOEXEC
+.Dv O_CLOEXEC
 flag was specified,
 the new descriptor is set to remain open across
 .Xr execve 2
@@ -416,7 +415,7 @@
 .Dv O_WRONLY ,
 .Dv O_RDWR
 and
-.Dv O_EXEC.
+.Dv O_EXEC .
 .It Bq Eq EBADF
 The
 .Fa path

==== //depot/projects/soc2009/trasz_limits/sbin/ggate/ggatel/ggatel.8#2 (text+ko) ====

@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/sbin/ggate/ggatel/ggatel.8,v 1.5 2005/01/18 10:09:34 ru Exp $
+.\" $FreeBSD: src/sbin/ggate/ggatel/ggatel.8,v 1.6 2011/04/02 06:59:05 pjd Exp $
 .\"
-.Dd April 26, 2004
+.Dd April 2, 2011
 .Dt GGATEL 8
 .Os
 .Sh NAME
@@ -35,7 +35,6 @@
 .Cm create
 .Op Fl v
 .Op Fl o Cm ro | wo | rw
-.Op Fl q Ar queue_size
 .Op Fl s Ar sectorsize
 .Op Fl t Ar timeout
 .Op Fl u Ar unit
@@ -100,10 +99,6 @@
 .Pq Cm rw .
 Default is
 .Cm rw .
-.It Fl q Ar queue_size
-Number of pending I/O requests that can be queued before they will
-start to be canceled.
-Default is 1024.
 .It Fl s Ar sectorsize
 Sector size for
 .Nm ggate

==== //depot/projects/soc2009/trasz_limits/sbin/ggate/ggatel/ggatel.c#3 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sbin/ggate/ggatel/ggatel.c,v 1.7 2010/02/18 23:16:19 pjd Exp $
+ * $FreeBSD: src/sbin/ggate/ggatel/ggatel.c,v 1.8 2011/04/02 06:59:05 pjd Exp $
  */
 
 #include 
@@ -53,7 +53,6 @@
 static int unit = G_GATE_UNIT_AUTO;
 static unsigned flags = 0;
 static int force = 0;
-static unsigned queue_size = G_GATE_QUEUE_SIZE;
 static unsigned sectorsize = 0;
 static unsigned timeout = G_GATE_TIMEOUT;
 
@@ -61,7 +60,7 @@
 usage(void)
 {
 
-	fprintf(stderr, "usage: %s create [-v] [-o ] [-q queue_size] "
+	fprintf(stderr, "usage: %s create [-v] [-o ] "
 	    "[-s sectorsize] [-t timeout] [-u unit] \n", getprogname());
 	fprintf(stderr, "       %s rescue [-v] [-o ] <-u unit> "
 	    "\n", getprogname());
@@ -182,7 +181,7 @@
 	ggioc.gctl_sectorsize = sectorsize;
 	ggioc.gctl_timeout = timeout;
 	ggioc.gctl_flags = flags;
-	ggioc.gctl_maxcount = queue_size;
+	ggioc.gctl_maxcount = 0;
 	strlcpy(ggioc.gctl_info, path, sizeof(ggioc.gctl_info));
 	g_gate_ioctl(G_GATE_CMD_CREATE, &ggioc);
 	if (unit == -1)
@@ -230,7 +229,7 @@
 	for (;;) {
 		int ch;
 
-		ch = getopt(argc, argv, "fo:q:s:t:u:v");
+		ch = getopt(argc, argv, "fo:s:t:u:v");
 		if (ch == -1)
 			break;
 		switch (ch) {
@@ -253,14 +252,6 @@
 				    "Invalid argument for '-o' option.");
 			}
 			break;
-		case 'q':
-			if (action != CREATE)
-				usage();
-			errno = 0;
-			queue_size = strtoul(optarg, NULL, 10);
-			if (queue_size == 0 && errno != 0)
-				errx(EXIT_FAILURE, "Invalid queue_size.");
-			break;
 		case 's':
 			if (action != CREATE)
 				usage();

==== //depot/projects/soc2009/trasz_limits/sbin/hastd/hast.conf.5#10 (text+ko) ====

@@ -26,9 +26,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/sbin/hastd/hast.conf.5,v 1.14 2011/03/21 08:54:59 pjd Exp $
+.\" $FreeBSD: src/sbin/hastd/hast.conf.5,v 1.15 2011/04/02 09:34:33 pjd Exp $
 .\"
-.Dd March 20, 2011
+.Dd April 2, 2011
 .Dt HAST.CONF 5
 .Os
 .Sh NAME
@@ -241,7 +241,7 @@
 .Pp
 Connection timeout in seconds.
 The default value is
-.Va 5 .
+.Va 20 .
 .It Ic exec Aq path
 .Pp
 Execute the given program on various HAST events.

==== //depot/projects/soc2009/trasz_limits/sbin/hastd/hast.h#10 (text+ko) ====

@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sbin/hastd/hast.h,v 1.14 2011/03/22 16:21:11 pjd Exp $
+ * $FreeBSD: src/sbin/hastd/hast.h,v 1.15 2011/04/02 09:34:33 pjd Exp $
  */
 
 #ifndef	_HAST_H_
@@ -83,7 +83,7 @@
 #define	HIO_KEEPALIVE		5
 
 #define	HAST_USER	"hast"
-#define	HAST_TIMEOUT	5
+#define	HAST_TIMEOUT	20
 #define	HAST_CONFIG	"/etc/hast.conf"
 #define	HAST_CONTROL	"/var/run/hastctl"
 #define	HASTD_LISTEN	"tcp4://0.0.0.0:8457"

==== //depot/projects/soc2009/trasz_limits/sbin/hastd/primary.c#16 (text+ko) ====

@@ -29,7 +29,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sbin/hastd/primary.c,v 1.67 2011/03/25 20:15:16 pjd Exp $");
+__FBSDID("$FreeBSD: src/sbin/hastd/primary.c,v 1.69 2011/04/02 09:25:13 pjd Exp $");
 
 #include 
 #include 
@@ -701,6 +701,11 @@
 		(void)hast_activemap_flush(res);
 	}
 	nv_free(nvin);
+	/* Setup directions. */
+	if (proto_send(out, NULL, 0) == -1)
+		pjdlog_errno(LOG_WARNING, "Unable to set connection direction");
+	if (proto_recv(in, NULL, 0) == -1)
+		pjdlog_errno(LOG_WARNING, "Unable to set connection direction");
 	pjdlog_info("Connected to %s.", res->hr_remoteaddr);
 	if (inp != NULL && outp != NULL) {
 		*inp = in;
@@ -761,7 +766,7 @@
 	ggiocreate.gctl_mediasize = res->hr_datasize;
 	ggiocreate.gctl_sectorsize = res->hr_local_sectorsize;
 	ggiocreate.gctl_flags = 0;
-	ggiocreate.gctl_maxcount = G_GATE_MAX_QUEUE_SIZE;
+	ggiocreate.gctl_maxcount = 0;
 	ggiocreate.gctl_timeout = 0;
 	ggiocreate.gctl_unit = G_GATE_NAME_GIVEN;
 	snprintf(ggiocreate.gctl_name, sizeof(ggiocreate.gctl_name), "hast/%s",

==== //depot/projects/soc2009/trasz_limits/sbin/hastd/proto_common.c#7 (text+ko) ====

@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2009-2010 The FreeBSD Foundation
+ * Copyright (c) 2011 Pawel Jakub Dawidek 
  * All rights reserved.
  *
  * This software was developed by Pawel Jakub Dawidek under sponsorship from
@@ -28,14 +29,17 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sbin/hastd/proto_common.c,v 1.9 2011/03/15 13:53:39 pjd Exp $");
+__FBSDID("$FreeBSD: src/sbin/hastd/proto_common.c,v 1.12 2011/04/02 09:31:02 pjd Exp $");
 
 #include 
 #include 
 
 #include 
+#include 
+#include 
 #include 
 #include 
+#include 
 
 #include "pjdlog.h"
 #include "proto_impl.h"
@@ -45,6 +49,16 @@
 #define	MAX_SEND_SIZE	32768
 #endif
 
+static bool
+blocking_socket(int sock)
+{
+	int flags;
+
+	flags = fcntl(sock, F_GETFL);
+	PJDLOG_ASSERT(flags >= 0);
+	return ((flags & O_NONBLOCK) == 0);

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

From owner-p4-projects@FreeBSD.ORG  Mon Apr  4 19:52:40 2011
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2C3621065673; Mon,  4 Apr 2011 19:52: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 E2502106564A
	for ; Mon,  4 Apr 2011 19:52:39 +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 CF0608FC1C
	for ; Mon,  4 Apr 2011 19:52: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 p34Jqd9g044151
	for ; Mon, 4 Apr 2011 19:52:39 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p34JqdcP044148
	for perforce@freebsd.org; Mon, 4 Apr 2011 19:52:39 GMT
	(envelope-from jhb@freebsd.org)
Date: Mon, 4 Apr 2011 19:52:39 GMT
Message-Id: <201104041952.p34JqdcP044148@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 191046 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, 04 Apr 2011 19:52:40 -0000

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

Change 191046 by jhb@jhb_jhbbsd on 2011/04/04 19:52:05

	- Fix rman_manage_region() to honor rm_start and rm_end.  This
	  exposed several bugs where rm_end was set to ~0u instead of
	  ~0ul.  Also, many rmans don't set rm_start and rm_end at all,
	  so make rman_init() set them to the full range if they are both
	  zero.
	- Fix bugs in rman_release_region() and its regression tests (the
	  tests now work properly).
	- Add rman_fetch_{first,last}_free_region() routines and regression
	  tests (which pass).
	- Compile.

Affected files ...

.. //depot/projects/pci/sys/arm/arm/nexus.c#2 edit
.. //depot/projects/pci/sys/dev/fdt/fdtbus.c#2 edit
.. //depot/projects/pci/sys/ia64/ia64/nexus.c#2 edit
.. //depot/projects/pci/sys/kern/subr_bus.c#3 edit
.. //depot/projects/pci/sys/kern/subr_rman.c#6 edit
.. //depot/projects/pci/sys/mips/mips/mainbus.c#2 edit
.. //depot/projects/pci/sys/mips/mips/nexus.c#2 edit
.. //depot/projects/pci/sys/mips/rmi/xlr_pci.c#2 edit
.. //depot/projects/pci/sys/modules/rman/rman.c#9 edit
.. //depot/projects/pci/sys/sys/rman.h#4 edit
.. //depot/projects/pci/sys/x86/x86/nexus.c#3 edit

Differences ...

==== //depot/projects/pci/sys/arm/arm/nexus.c#2 (text+ko) ====

@@ -138,10 +138,10 @@
 {
 
 	mem_rman.rm_start = 0;
-	mem_rman.rm_end = ~0u;
+	mem_rman.rm_end = ~0ul;
 	mem_rman.rm_type = RMAN_ARRAY;
 	mem_rman.rm_descr = "I/O memory addresses";
-	if (rman_init(&mem_rman) || rman_manage_region(&mem_rman, 0, ~0u))
+	if (rman_init(&mem_rman) || rman_manage_region(&mem_rman, 0, ~0))
 		panic("nexus_probe mem_rman");
 
 	/*

==== //depot/projects/pci/sys/dev/fdt/fdtbus.c#2 (text+ko) ====

@@ -206,7 +206,7 @@
 	 * Mem-mapped I/O space rman.
 	 */
 	start = 0;
-	end = ~0u;
+	end = ~0ul;
 	sc->sc_mem.rm_start = start;
 	sc->sc_mem.rm_end = end;
 	sc->sc_mem.rm_type = RMAN_ARRAY;

==== //depot/projects/pci/sys/ia64/ia64/nexus.c#2 (text+ko) ====

@@ -174,7 +174,7 @@
 		panic("nexus_probe port_rman");
 
 	mem_rman.rm_start = 0;
-	mem_rman.rm_end = ~0u;
+	mem_rman.rm_end = ~0ul;
 	mem_rman.rm_type = RMAN_ARRAY;
 	mem_rman.rm_descr = "I/O memory addresses";
 	if (rman_init(&mem_rman)

==== //depot/projects/pci/sys/kern/subr_bus.c#3 (text+ko) ====

@@ -3652,7 +3652,7 @@
  * BUS_ADJUST_RESOURCE() method of the parent of @p dev.
  */
 int
-bus_generic_adjust_resource(device_t bus, device_t child, int type,
+bus_generic_adjust_resource(device_t dev, device_t child, int type,
     struct resource *r, u_long start, u_long end)
 {
 	/* Propagate up the bus hierarchy until someone handles it. */

==== //depot/projects/pci/sys/kern/subr_rman.c#6 (text+ko) ====

@@ -133,11 +133,14 @@
 	static int once = 0;
 
 	if (once == 0) {
+		/* XXX: Should move to SYSINIT. */
 		once = 1;
 		TAILQ_INIT(&rman_head);
 		mtx_init(&rman_mtx, "rman head", NULL, MTX_DEF);
 	}
 
+	if (rm->rm_start == 0 && rm->rm_end == 0)
+		rm->rm_end = ~0ul;
 	if (rm->rm_type == RMAN_UNINIT)
 		panic("rman_init");
 	if (rm->rm_type == RMAN_GAUGE)
@@ -231,7 +234,7 @@
 int
 rman_release_region(struct rman *rm, u_long start, u_long end)
 {
-	struct resource_i *r, *s;
+	struct resource_i *r, *s, *t;
 
 	DPRINTF(("rman_release_region: <%s> request: start %#lx, end %#lx\n",
 	    rm->rm_descr, start, end));
@@ -242,7 +245,7 @@
 	TAILQ_FOREACH(r, &rm->rm_list, r_link) {
 		if (r->r_end == ULONG_MAX)
 			break;
-		if (r->r_end + 1 >= start)
+		if (r->r_end + 1 > start)
 			break;
 	}
 
@@ -281,16 +284,17 @@
 	 * adjust 'r', possibly splitting it.
 	 */
 	if (r->r_start == start && r->r_end == end) {
-		TAILQ_REMOVE(r, r_link);
+		TAILQ_REMOVE(&rm->rm_list, r, r_link);
 		free(r, M_RMAN);
 	} else if (r->r_start == start) {
-		KASSERT(end > r->r_end, ("resource entry too small"));
+		KASSERT(end < r->r_end, ("resource entry too small"));
 		r->r_start = end + 1;
 	} else if (r->r_end == end) {
-		KASSERT(start < r->r_start, ("resource entry too small"));
+		KASSERT(start > r->r_start, ("resource entry too small"));
 		r->r_end = start - 1;
 	} else {
-		KASSERT(r->r_start < start && end < r->r_end, ("resource entry too small"));
+		KASSERT(r->r_start < start && end < r->r_end,
+		    ("resource entry too small"));
 		s = int_alloc_resource(M_NOWAIT);
 		if (s == NULL) {
 			mtx_unlock(rm->rm_mtx);
@@ -349,6 +353,42 @@
 	return 0;
 }
 
+int
+rman_first_free_region(struct rman *rm, u_long *start, u_long *end)
+{
+	struct resource_i *r;
+
+	mtx_lock(rm->rm_mtx);
+	TAILQ_FOREACH(r, &rm->rm_list, r_link) {
+		if (!(r->r_flags & RF_ALLOCATED)) {
+			*start = r->r_start;
+			*end = r->r_end;
+			mtx_unlock(rm->rm_mtx);
+			return (0);
+		}
+	}
+	mtx_unlock(rm->rm_mtx);
+	return (ENOENT);
+}
+
+int
+rman_last_free_region(struct rman *rm, u_long *start, u_long *end)
+{
+	struct resource_i *r;
+
+	mtx_lock(rm->rm_mtx);
+	TAILQ_FOREACH_REVERSE(r, &rm->rm_list, resource_head, r_link) {
+		if (!(r->r_flags & RF_ALLOCATED)) {
+			*start = r->r_start;
+			*end = r->r_end;
+			mtx_unlock(rm->rm_mtx);
+			return (0);
+		}
+	}
+	mtx_unlock(rm->rm_mtx);
+	return (ENOENT);
+}
+
 /* Shrink or extend one or both ends of an allocated resource. */
 int
 rman_adjust_resource(struct resource *rr, u_long start, u_long end)

==== //depot/projects/pci/sys/mips/mips/mainbus.c#2 (text+ko) ====

@@ -146,7 +146,7 @@
 		panic("mainbus_probe port_rman");
 
 	mem_rman.rm_start = 0;
-	mem_rman.rm_end = ~0u;
+	mem_rman.rm_end = ~0ul;
 	mem_rman.rm_type = RMAN_ARRAY;
 	mem_rman.rm_descr = "I/O memory addresses";
 	if (rman_init(&mem_rman) || rman_manage_region(&mem_rman, 0, ~0))

==== //depot/projects/pci/sys/mips/mips/nexus.c#2 (text+ko) ====

@@ -151,7 +151,7 @@
 	}
 
 	mem_rman.rm_start = 0;
-	mem_rman.rm_end = ~0u;
+	mem_rman.rm_end = ~0ul;
 	mem_rman.rm_type = RMAN_ARRAY;
 	mem_rman.rm_descr = "Memory addresses";
 	if (rman_init(&mem_rman) != 0 ||

==== //depot/projects/pci/sys/mips/rmi/xlr_pci.c#2 (text+ko) ====

@@ -126,7 +126,7 @@
 		panic("pci_init_resources irq_rman");
 
 	port_rman.rm_start = 0;
-	port_rman.rm_end = ~0u;
+	port_rman.rm_end = ~0ul;
 	port_rman.rm_type = RMAN_ARRAY;
 	port_rman.rm_descr = "I/O ports";
 	if (rman_init(&port_rman)
@@ -134,7 +134,7 @@
 		panic("pci_init_resources port_rman");
 
 	mem_rman.rm_start = 0;
-	mem_rman.rm_end = ~0u;
+	mem_rman.rm_end = ~0ul;
 	mem_rman.rm_type = RMAN_ARRAY;
 	mem_rman.rm_descr = "I/O memory";
 	if (rman_init(&mem_rman)

==== //depot/projects/pci/sys/modules/rman/rman.c#9 (text+ko) ====

@@ -293,6 +293,7 @@
 	rman_release_resource(r);
 	r = NULL;
 	assert_rman_ok();
+	printf("%s: finished successfully\n", __func__);
 }
 
 struct region {
@@ -355,7 +356,7 @@
 			/* Next region. */
 			count--;
 			r++;
-			start = r->r_start;
+			start = r->start;
 		} else
 			start = i->r_end + 1;
 		i = TAILQ_NEXT(i, r_link);
@@ -373,12 +374,12 @@
 #define RELEASE_SHOULD_FAIL(start, end, err) do {			\
 	error = rman_release_region(&test, (start), (end));		\
 	if (error == (err))						\
-		printf("Correctly failed to release (%x, %x)\n",	\
-		    (start), (end));					\
+		printf("Correctly failed to release (%lx, %lx)\n",	\
+		    (u_long)(start), (u_long)(end));			\
 	else {								\
 		if (error)						\
-			printf("Failed to release (%x, %x) with %d\n",	\
-			    (start), (end), error);			\
+			printf("Failed to release (%lx, %lx) with %d\n",\
+			    (u_long)(start), (u_long)(end), error);	\
 		else							\
 			printf("Incorrectly released (%lx, %lx)\n",	\
 			    rman_get_start(r), rman_get_end(r));	\
@@ -389,22 +390,22 @@
 #define RELEASE_SHOULD_WORK(start, end) do {				\
 	error = rman_release_region(&test, (start), (end));		\
 	if (error) {							\
-		printf("Failed to release (%x, %x) with %d\n",		\
-		    (start), (end), error);				\
+		printf("Failed to release (%lx, %lx) with %d\n",	\
+		    (u_long)(start), (u_long)(end), error);		\
 		return;							\
 	}								\
-	printf("Released (%x, %x)\n", (start), (end));			\
+	printf("Released (%lx, %lx)\n", (u_long)(start), (u_long)(end)); \
 	assert_rman_hole((start), (end));				\
 } while (0)
 
 #define MANAGE_SHOULD_WORK(start, end) do {				\
 	error = rman_manage_region(&test, (start), (end));		\
 	if (error) {							\
-		printf("Failed to manage (%x, %x) with %d\n",		\
-		    (start), (end), error);				\
+		printf("Failed to manage (%lx, %lx) with %d\n",		\
+		    (u_long)(start), (u_long)(end), error);		\
 		return;							\
 	}								\
-	printf("Managed (%x, %x)\n", (start), (end));			\
+	printf("Managed (%lx, %lx)\n", (u_long)(start), (u_long)(end));	\
 	assert_rman_managed((start), (end));				\
 } while (0)
 
@@ -500,8 +501,172 @@
 	assert_rman_ok();
 
 	rman_release_resource(r);
+	r = NULL;
 	assert_rman_regions(regions, 1);
 	assert_rman_ok();
+	printf("%s: finished successfully\n", __func__);
+}
+
+static void
+fetch_free_regression_tests(void)
+{
+	int error;
+
+#define FIRST_SHOULD_WORK(start, end) do {				\
+	u_long _start, _end;						\
+									\
+	error = rman_first_free_region(&test, &_start, &_end);		\
+	if (error) {							\
+		printf("Failed to fetch free region (%x, %x) with %d\n",\
+		    (start), (end), error);				\
+		return;							\
+	}								\
+	printf("Fetched free region (%x, %x)\n", (start), (end));	\
+} while (0)
+
+#define	FIRST_SHOULD_FAIL(err) do {					\
+	u_long _start, _end;						\
+									\
+	error = rman_first_free_region(&test, &_start, &_end);		\
+	if (error == (err))						\
+		printf("Correctly failed to fetch free region\n");	\
+	else {								\
+		if (error)						\
+			printf("Failed to fetch free region with %d\n",	\
+			    error);					\
+		else							\
+			printf("Incorrectly fetched free region (%lx, %lx)\n",\
+			    _start, _end);				\
+		return;							\
+	}								\
+} while (0)
+
+#define LAST_SHOULD_WORK(start, end) do {				\
+	u_long _start, _end;						\
+									\
+	error = rman_last_free_region(&test, &_start, &_end);		\
+	if (error) {							\
+		printf("Failed to fetch free region (%x, %x) with %d\n",\
+		    (start), (end), error);				\
+		return;							\
+	}								\
+	printf("Fetched free region (%x, %x)\n", (start), (end));	\
+} while (0)
+
+#define	LAST_SHOULD_FAIL(err) do {					\
+	u_long _start, _end;						\
+									\
+	error = rman_last_free_region(&test, &_start, &_end);		\
+	if (error == (err))						\
+		printf("Correctly failed to fetch free region\n");	\
+	else {								\
+		if (error)						\
+			printf("Failed to fetch free region with %d\n",	\
+			    error);					\
+		else							\
+			printf("Incorrectly fetched free region (%lx, %lx)\n",\
+			    _start, _end);				\
+		return;							\
+	}								\
+} while (0)
+
+	/* Clear any released resources. */
+	if (r != NULL) {
+		rman_release_resource(r);
+		r = NULL;
+	}
+	if (s != NULL) {
+		rman_release_resource(s);
+		s = NULL;
+	}
+	assert_rman_ok();
+
+	/* Should have one free region covering the full range. */
+	FIRST_SHOULD_WORK(REGION_START, REGION_END);
+	LAST_SHOULD_WORK(REGION_START, REGION_END);
+
+	/* Allocate 'r' at the beginning. */
+	r = rman_reserve_resource(&test, REGION_START, REGION_START + 0xf,
+	    0x10, 0, NULL);
+	if (r == NULL) {
+		printf("Failed to allocate resource\n");
+		return;
+	}
+	printf("Allocated (%lx, %lx)\n", rman_get_start(r), rman_get_end(r));
+
+	/* Should have one free region at the end. */
+	FIRST_SHOULD_WORK(REGION_START + 0x10, REGION_END);
+	LAST_SHOULD_WORK(REGION_START + 0x10, REGION_END);
+
+	/* Allocate 'r' at the end. */
+	rman_release_resource(r);
+	r = rman_reserve_resource(&test, REGION_END - 0x10, REGION_END,
+	    0x11, 0, NULL);
+	if (r == NULL) {
+		printf("Failed to allocate resource\n");
+		return;
+	}
+	printf("Allocated (%lx, %lx)\n", rman_get_start(r), rman_get_end(r));
+
+	/* Should have one free region at the beginning. */
+	FIRST_SHOULD_WORK(REGION_START, REGION_END - 0x11);
+	FIRST_SHOULD_WORK(REGION_START, REGION_END - 0x11);
+
+	/* Move 'r' to the middle. */
+	rman_release_resource(r);
+	r = rman_reserve_resource(&test, REGION_START + 0x10, REGION_END - 0x10,
+	    REGION_END - 0x10 - (REGION_START + 0x10) + 1, 0, NULL);
+	if (r == NULL) {
+		printf("Failed to allocate resource\n");
+		return;
+	}
+	printf("Allocated (%lx, %lx)\n", rman_get_start(r), rman_get_end(r));
+
+	/* Should have two free regions. */
+	FIRST_SHOULD_WORK(REGION_START, REGION_START + 0xf);
+	LAST_SHOULD_WORK(REGION_END - 0x0f, REGION_END);
+
+	/* Allocate the whole darn thing. */
+	ADJUST_SHOULD_WORK(REGION_START, REGION_END);
+
+	/* Should have no free region. */
+	FIRST_SHOULD_FAIL(ENOENT);
+	LAST_SHOULD_FAIL(ENOENT);
+
+	ADJUST_SHOULD_WORK(REGION_START, REGION_START + 0x1f);
+	s = rman_reserve_resource(&test, REGION_START + 0x20, REGION_END,
+	    REGION_END - (REGION_START + 0x20) + 1, 0, NULL);
+	if (s == NULL) {
+		printf("Failed to allocate resource\n");
+		return;
+	}
+	printf("Allocated (%lx, %lx)\n", rman_get_start(s), rman_get_end(s));
+
+	/* Should have no free region. */
+	FIRST_SHOULD_FAIL(ENOENT);
+	LAST_SHOULD_FAIL(ENOENT);
+
+	rman_release_resource(r);
+	r = NULL;
+	rman_release_resource(s);
+	s = NULL;
+
+	/* Should have one free region covering the full range. */
+	FIRST_SHOULD_WORK(REGION_START, REGION_END);
+	LAST_SHOULD_WORK(REGION_START, REGION_END);
+
+	/* Empty the rman. */
+	RELEASE_SHOULD_WORK(REGION_START, REGION_END);
+	assert_rman_regions(NULL, 0);
+
+	/* Should have no free region. */
+	FIRST_SHOULD_FAIL(ENOENT);
+	LAST_SHOULD_FAIL(ENOENT);
+
+	/* Cleanup. */
+	MANAGE_SHOULD_WORK(REGION_START, REGION_END);
+	assert_rman_ok();
+	printf("%s: finished successfully\n", __func__);
 }
 
 static int
@@ -512,13 +677,16 @@
 	error = sysctl_handle_int(oidp, &i, sizeof(i), req);
 	if (error || req->newptr == NULL || i == 0)
 		return (error);
-	switch (oip->arg2) {
+	switch (oidp->oid_arg2) {
 	case 0:
 		adjust_regression_tests();
 		break;
 	case 1:
 		region_regression_tests();
 		break;
+	case 2:
+		fetch_free_regression_tests();
+		break;
 	}
 	return (error);
 }
@@ -526,18 +694,8 @@
     sysctl_rman_test, "I", "run regression tests for rman_adjust_resource()");
 SYSCTL_PROC(_debug_rman, OID_AUTO, test_region, CTLTYPE_INT | CTLFLAG_RW, 0, 1,
     sysctl_rman_test, "I", "run regression tests for rman_release_region()");
-
-static int
-sysctl_rman_test_region(SYSCTL_HANDLER_ARGS)
-{
-	int error, i = 0;
-
-	error = sysctl_handle_int(oidp, &i, sizeof(i), req);
-	if (error || req->newptr == NULL || i == 0)
-		return (error);
-	region_regression_tests();
-	return (error);
-}
+SYSCTL_PROC(_debug_rman, OID_AUTO, test_fetch, CTLTYPE_INT | CTLFLAG_RW, 0, 2,
+    sysctl_rman_test, "I", "run regression tests for rman_fetch_*_free_region()");
 
 static int
 load(void)

==== //depot/projects/pci/sys/sys/rman.h#4 (text+ko) ====

@@ -118,6 +118,7 @@
 int	rman_activate_resource(struct resource *r);
 int	rman_adjust_resource(struct resource *r, u_long start, u_long end);
 int	rman_await_resource(struct resource *r, int pri, int timo);
+int	rman_first_free_region(struct rman *rm, u_long *start, u_long *end);
 bus_space_handle_t rman_get_bushandle(struct resource *);
 bus_space_tag_t rman_get_bustag(struct resource *);
 u_long	rman_get_end(struct resource *);
@@ -131,6 +132,7 @@
 int	rman_fini(struct rman *rm);
 int	rman_init(struct rman *rm);
 int	rman_init_from_resource(struct rman *rm, struct resource *r);
+int	rman_last_free_region(struct rman *rm, u_long *start, u_long *end);
 uint32_t rman_make_alignment_flags(uint32_t size);
 int	rman_manage_region(struct rman *rm, u_long start, u_long end);
 int	rman_is_region_manager(struct resource *r, struct rman *rm);

==== //depot/projects/pci/sys/x86/x86/nexus.c#3 (text+ko) ====

@@ -259,7 +259,7 @@
 		panic("nexus_init_resources port_rman");
 
 	mem_rman.rm_start = 0;
-	mem_rman.rm_end = ~0u;
+	mem_rman.rm_end = ~0ul;
 	mem_rman.rm_type = RMAN_ARRAY;
 	mem_rman.rm_descr = "I/O memory addresses";
 	if (rman_init(&mem_rman)

From owner-p4-projects@FreeBSD.ORG  Mon Apr  4 20:26:42 2011
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 82F1410656B7; Mon,  4 Apr 2011 20:26: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 440411065696
	for ; Mon,  4 Apr 2011 20:26:42 +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 291718FC08
	for ; Mon,  4 Apr 2011 20:26:42 +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 p34KQgBM050075
	for ; Mon, 4 Apr 2011 20:26:42 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p34KQg8I050072
	for perforce@freebsd.org; Mon, 4 Apr 2011 20:26:42 GMT
	(envelope-from jhb@freebsd.org)
Date: Mon, 4 Apr 2011 20:26:42 GMT
Message-Id: <201104042026.p34KQg8I050072@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 191047 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, 04 Apr 2011 20:26:43 -0000

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

Change 191047 by jhb@jhb_jhbbsd on 2011/04/04 20:25:44

	Checkpoint.  Have routines for suballocating from the window
	and for growing the window if needed.  Next up is writing a new
	pcib_alloc_resource() based on these routines.  We will need
	special handling for ISA resources similar to the special
	handling for VGA resources I think.

Affected files ...

.. //depot/projects/pci/sys/dev/pci/pci_pci.c#6 edit
.. //depot/projects/pci/sys/dev/pci/pcib_private.h#5 edit

Differences ...

==== //depot/projects/pci/sys/dev/pci/pci_pci.c#6 (text+ko) ====

@@ -53,12 +53,6 @@
 
 #include "pcib_if.h"
 
-#ifdef NEW_PCIB
-#define	WIN_IO		0x1
-#define	WIN_MEM		0x2
-#define	WIN_PMEM	0x4
-#endif
-
 static int		pcib_probe(device_t dev);
 static int		pcib_suspend(device_t dev);
 static int		pcib_resume(device_t dev);
@@ -144,7 +138,7 @@
 
 static void
 pcib_alloc_window(struct pcib_softc *sc, struct pcib_window *w, int type,
-    int reg, int flags, const char *name, pci_addr_t max_address)
+    int flags, const char *name, pci_addr_t max_address)
 {
 	int error, rid;
 
@@ -169,7 +163,7 @@
 		    "initial %s window has too many bits, ignoring\n", name);
 		return;
 	}
-	rid = reg;
+	rid = w->reg;
 	w->res = bus_alloc_resource(sc->dev, type, &rid, w->base, w->limit,
 	    w->limit - w->base + 1, flags);
 	if (w->res == NULL) {
@@ -215,6 +209,9 @@
 
 	/* Read the existing I/O port window. */
 	if (sc->io.valid) {
+		sc->io.reg = PCIR_IOBASEL_1;
+		sc->io.step = 12;
+		sc->io.mask = WIN_IO;
 		if ((val & PCIM_BRIO_MASK) == PCIM_BRIO_32) {
 			sc->io.base = PCI_PPBIOBASE(
 			    pci_read_config(dev, PCIR_IOBASEH_1, 2), val);
@@ -228,18 +225,21 @@
 			    pci_read_config(dev, PCIR_IOLIMITL_1, 1));
 			max = 0xffff;
 		}
-		pcib_alloc_window(sc, &sc->io, SYS_RES_IOPORT, PCIR_IOBASEL_1,
-		    0, "I/O port", max);
+		pcib_alloc_window(sc, &sc->io, SYS_RES_IOPORT, 0, "I/O port",
+		    max);
 	}
 
 	/* Read the existing memory window. */
 	sc->mem.valid = 1;
+	sc->mem.reg = PCIR_MEMBASE_1;
+	sc->mem.step = 20;
+	sc->mem.mask = WIN_MEM;
 	sc->mem.base = PCI_PPBMEMBASE(0,
 	    pci_read_config(dev, PCIR_MEMBASE_1, 2));
 	sc->mem.limit = PCI_PPBMEMLIMIT(0,
 	    pci_read_config(dev, PCIR_MEMLIMIT_1, 2));
-	pcib_alloc_window(sc, &sc->mem, SYS_RES_MEMORY, PCIR_MEMBASE_1, 0,
-	    "memory", 0xffffffff);
+	pcib_alloc_window(sc, &sc->mem, SYS_RES_MEMORY, 0, "memory",
+	    0xffffffff);
 
 	/* Determine if the prefetchable memory window is implemented. */
 	val = pci_read_config(dev, PCIR_PMBASEL_1, 2);
@@ -258,6 +258,9 @@
 
 	/* Read the existing prefetchable memory window. */
 	if (sc->pmem.valid) {
+		sc->pmem.reg = PCIR_PMBASEL_1;
+		sc->pmem.step = 20;
+		sc->omem.mask = WIN_PMEM;
 		if ((val & PCIM_BRPM_MASK) == PCIM_BRPM_64) {
 			sc->pmem.base = PCI_PPBMEMBASE(
 			    pci_read_config(dev, PCIR_PMBASEH_1, 4), pmemlow);
@@ -271,7 +274,7 @@
 			    pci_read_config(dev, PCIR_PMLIMITL_1, 2));
 			max = 0xffffffff;
 		}
-		pcib_alloc_window(sc, &sc->pmem, SYS_RES_MEMORY, PCIR_PMBASEL_1,
+		pcib_alloc_window(sc, &sc->pmem, SYS_RES_MEMORY,
 		    RF_PREFETCHABLE, "prefetchable memory", max);
 	}
 }
@@ -780,9 +783,138 @@
 
 /*
  * Attempt to grow a window to make room for a given resource request.
+ * The 'step' parameter is log_2 of the desired I/O window's alignment.
  */
 static int
-pcib_grow_window(struct pcib_softc *sc, struct pcib_window *w
+pcib_grow_window(struct pcib_softc *sc, struct pcib_window *w, u_long start,
+    u_long end, u_long count, u_int flags)
+{
+	u_long align, start_free, end_free, front, back;
+	int error, rid;
+
+	/*
+	 * If there is no resource at all, just try to allocate enough
+	 * aligned space for this resource.
+	 */
+	if (w->res == NULL) {
+		if (RF_ALIGNMENT(flags) < w->step) {
+			flags &= ~RF_ALIGNMENT_MASK;
+			flags |= RF_ALIGNMENT_LOG2(w->step);
+		}
+		start &= ((1ul << w->step) - 1);
+		end |= ((1ul << w->step) - 1);
+		if (count < (1ul << w->step))
+			count = 1ul << w->step;
+		rid = w->reg;
+		w->res = bus_alloc_resource(sc->dev, w == &sc->io ?
+		    SYS_RES_IOPORT : SYS_RES_MEMORY, &rid, start, end, count,
+		    flags);
+		if (w->res == NULL)
+			return (ENXIO);
+		goto updatewin;
+	}
+
+	/*
+	 * See if growing the window would help.  Compute the minimum
+	 * amount of address space needed on both the front and back
+	 * ends of the existing window to satisfy the allocation.
+	 *
+	 * For each end, build a candidate region adjusting for the
+	 * required alignment, etc.  If there is a free region at the
+	 * edge of the window, grow from the inner edge of the free
+	 * region.  Otherwise grow from the window boundary.
+	 *
+	 * XXX: Special case: if w->res is completely empty and the
+	 * request size is larger than w->res, we should find the
+	 * optimal aligned buffer containing w->res and allocate that.
+	 */
+	align = 1ul << RF_ALIGNMENT_MASK(flags);
+	if (start < rman_get_start(w->res)) {
+		if (rman_first_free_region(&w->rm, &start_free, &end_free) !=
+		    0 || start_free != rman_get_start(w->res))
+			end_free = rman_get_start(w->res) - 1;
+		if (end_free > end)
+			end_free = end;
+
+		/* Move end_free down until it is properly aligned. */
+		end_free &= (align - 1);
+		front = end_free - count;
+
+		/*
+		 * The resource would now be allocated at (front,
+		 * end_free).  Ensure that fits in the (start, end)
+		 * bounds.  end_free is checked above.  If 'front' is
+		 * ok, ensure it is properly aligned for this window.
+		 */
+		if (front >= start) {
+			front &= (1ul << w->step) - 1;
+			front = rman_get_start(w->res) - front;
+		} else
+			front = 0;
+	} else
+		front = 0;
+	if (end > rman_get_end(w->res)) {
+		if (rman_last_free_region(&w->rm, &start_free, &end_free) !=
+		    0 || end_free != rman_get_end(w->res))
+			start_free = rman_get_end(w->res) + 1;
+		if (start_free < start)
+			start_free = start;
+		
+		/* Move start_free up until it is properly aligned. */
+		start_free = roundup2(start_free, align);
+		back = start_free + count;
+
+		/*
+		 * The resource would now be allocated at (start_free,
+		 * back).  Ensure that fits in the (start, end)
+		 * bounds.  start_free is checked above.  If 'back' is
+		 * ok, ensure it is properly aligned for this window.
+		 */
+		if (back <= end) {
+			back = roundup2(back, w->step) - 1;
+			back -= rman_get_end(w->res);
+		} else
+			back = 0;
+	} else
+		back = 0;
+
+	/*
+	 * Try to allocate the smallest needed region first.
+	 * If that fails, fall back to the other region.
+	 */
+	error = ENOSPC;
+	while (front != 0 || back != 0) {
+		if (front != 0 && (front <= back || back == 0)) {
+			error = bus_adjust_resource(sc->dev, w->type, w->res,
+			    rman_get_start(w->res) - front,
+			    rman_get_end(w->res));
+			if (error == 0)
+				break;
+			front = 0;
+		} else {
+			error = bus_adjust_resource(sc->dev, w->type, w->res,
+			    rman_get_start(w->res),
+			    rman_get_end(w->res) + back);
+			if (error == 0)
+				break;
+			back = 0;
+		}
+	}
+
+	if (error)
+		return (error);
+
+updatewin:
+	/* Save the new window. */
+	w->base = rman_get_start(w->res);
+	w->limit = rman_get_end(w->res);
+	KASSERT((w->base & ((1ul << w->step) - 1)) == 0,
+	    ("start address is not aligned"));
+	KASSERT((w->end & ((1ul << w->step) - 1)) == (1ul << w->step) - 1,
+	    ("end address is not aligned"));
+	pcib_write_windows(sc, w->mask);
+	return (0);
+}
 
 /*
  * We have to trap resource allocation requests and ensure that the bridge

==== //depot/projects/pci/sys/dev/pci/pcib_private.h#5 (text+ko) ====

@@ -40,12 +40,19 @@
 DECLARE_CLASS(pcib_driver);
 
 #ifdef NEW_PCIB
+#define	WIN_IO		0x1
+#define	WIN_MEM		0x2
+#define	WIN_PMEM	0x4
+
 struct pcib_window {
-    pci_addr_t	base;
-    pci_addr_t	limit;
+    pci_addr_t	base;		/* base address */
+    pci_addr_t	limit;		/* topmost address */
     struct rman	rman;
     struct resource *res;
+    int		reg;		/* resource id from parent */
     int		valid;
+    int		mask;		/* WIN_* bitmask of this window */
+    int		step;		/* log_2 of window granularity */
 };
 #endif
 
@@ -64,10 +71,9 @@
     u_int	secbus;		/* secondary bus number */
     u_int	subbus;		/* subordinate bus number */
 #ifdef NEW_PCIB
-    u_int	valid_windows;
+    struct pcib_window io;	/* I/O port window */
+    struct pcib_window mem;	/* memory window */
     struct pcib_window pmem;	/* prefetchable memory window */
-    struct pcib_window mem;	/* memory window */
-    struct pcib_window io;	/* I/O port window */
 #else
     pci_addr_t	pmembase;	/* base address of prefetchable memory */
     pci_addr_t	pmemlimit;	/* topmost address of prefetchable memory */

From owner-p4-projects@FreeBSD.ORG  Tue Apr  5 11:04:13 2011
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5521E1065672; Tue,  5 Apr 2011 11:04:13 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 17BB0106566C
	for ; Tue,  5 Apr 2011 11:04:13 +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 036138FC0C
	for ; Tue,  5 Apr 2011 11:04:13 +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 p35B4CGW021445
	for ; Tue, 5 Apr 2011 11:04:12 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p35B4CTc021442
	for perforce@freebsd.org; Tue, 5 Apr 2011 11:04:12 GMT
	(envelope-from jhb@freebsd.org)
Date: Tue, 5 Apr 2011 11:04:12 GMT
Message-Id: <201104051104.p35B4CTc021442@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 191064 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Tue, 05 Apr 2011 11:04:13 -0000

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

Change 191064 by jhb@jhb_kavik on 2011/04/05 11:03:35

	Flesh out the new pcib_alloc_resource().  Need to add some bootverbose
	printfs next and then we can start trying it out.

Affected files ...

.. //depot/projects/pci/sys/dev/pci/pci_pci.c#7 edit

Differences ...

==== //depot/projects/pci/sys/dev/pci/pci_pci.c#7 (text+ko) ====

@@ -110,7 +110,7 @@
 {
 
 	/* XXX: Can subtractive bridges still use windows? */
-#if 0
+#ifndef SUBTRACTIVE_WITH_WINDOWS
 	/* Subtractive bridges don't manage resources. */
 	if (sc->flags & PCIB_SUBTRACTIVE)
 		return (0);
@@ -786,13 +786,22 @@
  * The 'step' parameter is log_2 of the desired I/O window's alignment.
  */
 static int
-pcib_grow_window(struct pcib_softc *sc, struct pcib_window *w, u_long start,
-    u_long end, u_long count, u_int flags)
+pcib_grow_window(struct pcib_softc *sc, struct pcib_window *w, int type,
+    u_long start, u_long end, u_long count, u_int flags)
 {
 	u_long align, start_free, end_free, front, back;
 	int error, rid;
 
 	/*
+	 * Clamp the desired resource range to the maximum address
+	 * this window supports.  Reject impossible requests.
+	 */
+	if (end > w->max_address)
+		end = w->max_address;
+	if (start + count > end || start + count < start)
+		return (EINVAL);
+
+	/*
 	 * If there is no resource at all, just try to allocate enough
 	 * aligned space for this resource.
 	 */
@@ -806,9 +815,8 @@
 		if (count < (1ul << w->step))
 			count = 1ul << w->step;
 		rid = w->reg;
-		w->res = bus_alloc_resource(sc->dev, w == &sc->io ?
-		    SYS_RES_IOPORT : SYS_RES_MEMORY, &rid, start, end, count,
-		    flags);
+		w->res = bus_alloc_resource(sc->dev, type, &rid, start, end,
+		    count, flags);
 		if (w->res == NULL)
 			return (ENXIO);
 		goto updatewin;
@@ -925,11 +933,106 @@
     u_long start, u_long end, u_long count, u_int flags)
 {
 	struct pcib_softc *sc;
+	struct resource *r;
 
 	sc = device_get_softc(dev);
+
+	/*
+	 * VGA resources are decoded iff the VGA enable bit is set in
+	 * the bridge control register.  VGA resources do not fall into
+	 * the resource windows and are passed up to the parent.
+	 */
+	if (type == SYS_RES_IOPORT && pci_is_vga_ioport_range(start, end) ||
+	    type == SYS_RES_MEMORY && pci_is_vga_memory_range(start, end)) {
+		if (sc->bridgectl & PCIB_BCR_VGA_ENABLE)
+			return (bus_generic_alloc_resource(dev, child, type,
+			    rid, start, end, count, flags));
+		else
+			return (NULL);
+	}
+
+	/*
+	 * XXX: Need similar handling for ISA resources subject to the
+	 * ISA enable bit.
+	 */
+#ifdef notyet
+	if (type == SYS_RES_IOPORT && pci_is_isa_ioport_range(start, end) ||
+	    type == SYS_RES_MEMORY && pci_is_isa_memory_range(start, end)) {
+		if (sc->bridgectl & PCIB_BCR_ISA_ENABLE)
+			return (bus_generic_alloc_resource(dev, child, type,
+			    rid, start, end, count, flags));
+		else
+			return (NULL);
+	}
+#endif
+
+#ifndef SUBTRACTIVE_WITH_WINDOWS
+	/*
+	 * XXX: What to do about subtractive bridges?  Do they have windows?
+	 */
+	if (sc->flags & PCIB_SUBTRACTIVE)
+		return (bus_generic_alloc_resource(dev, child, type, rid,
+		    stat, end, count, flags));
+#endif
+
 	switch (type) {
-		
-
+	case SYS_RES_IOPORT:
+		r = pcib_suballoc_resource(sc, &sc->io, child, type, rid, start,
+		    end, count, flags);
+		if (r != NULL)
+			break;
+#ifdef SUBTRACTIVE_WITH_WINDOWS
+		if (sc->flags & PCIB_SUBTRACTIVE)
+			break;
+#endif
+		if (pcib_grow_window(sc, &sc->io, type, start, end, count,
+		    flags) == 0)
+			r = pcib_suballoc_resource(sc, &sc->io, child, type,
+			    rid, start, end, count, flags);
+		break;
+	case SYS_RES_MEMORY:
+		/*
+		 * For prefetchable resources, prefer the prefectable
+		 * memory window, but fall back to the regular memory
+		 * window if that fails.  Try both windows before
+		 * attempting to grow a window in case the firmware
+		 * has used a range in the regular memory window to
+		 * map a prefetchable BAR.
+		 */
+		if (flags & RF_PREFETCHABLE) {
+			r = pcib_suballoc_resource(sc, &sc->pmem, child, type,
+			    rid, start, end, count, flags);
+			if (r != NULL)
+				break;
+		}
+		r = pcib_suballoc_resource(sc, &sc->mem, child, type, rid,
+		    start, end, count, flags);
+		if (r != NULL)
+			break;
+#ifdef SUBTRACTIVE_WITH_WINDOWS
+		if (sc->flags & PCIB_SUBTRACTIVE)
+			break;
+#endif
+		if (flags & RF_PREFETCHABLE) {
+			if (pcib_grow_window(sc, &sc->pmem, type, start, end,
+			    count, flags) == 0) {
+				r = pcib_suballoc_resource(sc, &sc->pmem, child,
+				    type, rid, start, end, count, flags);
+				if (r != NULL)
+					break;
+			}
+		}
+		if (pcib_grow_window(sc, &sc->mem, type, start, end, count,
+		    flags & ~RF_PREFETCHABLE) == 0)
+			r = pcib_suballoc_resource(sc, &sc->mem, child, type,
+			    rid, start, end, count, flags);
+		break;
+	default:
+		return (bus_generic_alloc_resource(dev, child, type, rid,
+		    stat, end, count, flags));
+	}
+	return (r);
+}
 #else
 /*
  * We have to trap resource allocation requests and ensure that the bridge

From owner-p4-projects@FreeBSD.ORG  Tue Apr  5 19:43:06 2011
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 140D21065670; Tue,  5 Apr 2011 19:43: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 CA54A106564A
	for ; Tue,  5 Apr 2011 19:43:05 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id B7D138FC12
	for ; Tue,  5 Apr 2011 19:43:05 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p35Jh5iE020662
	for ; Tue, 5 Apr 2011 19:43:05 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p35Jh583020659
	for perforce@freebsd.org; Tue, 5 Apr 2011 19:43:05 GMT
	(envelope-from jhb@freebsd.org)
Date: Tue, 5 Apr 2011 19:43:05 GMT
Message-Id: <201104051943.p35Jh583020659@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 191077 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Tue, 05 Apr 2011 19:43:06 -0000

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

Change 191077 by jhb@jhb_jhbbsd on 2011/04/05 19:42:58

	- Add some bootverbose printfs for debugging.
	- Compile.

Affected files ...

.. //depot/projects/pci/sys/amd64/pci/pci_bus.c#3 edit
.. //depot/projects/pci/sys/dev/acpica/acpi_pcib_acpi.c#3 edit
.. //depot/projects/pci/sys/dev/acpica/acpi_pcib_pci.c#2 edit
.. //depot/projects/pci/sys/dev/pci/pci_pci.c#8 edit
.. //depot/projects/pci/sys/dev/pci/pcib_private.h#6 edit
.. //depot/projects/pci/sys/i386/pci/pci_bus.c#3 edit
.. //depot/projects/pci/sys/sparc64/pci/apb.c#2 edit
.. //depot/projects/pci/sys/sparc64/pci/ofw_pcib.c#2 edit
.. //depot/projects/pci/sys/x86/pci/qpi.c#2 edit
.. //depot/projects/pci/sys/x86/x86/mptable_pci.c#3 edit

Differences ...

==== //depot/projects/pci/sys/amd64/pci/pci_bus.c#3 (text+ko) ====

@@ -35,6 +35,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 

==== //depot/projects/pci/sys/dev/acpica/acpi_pcib_acpi.c#3 (text+ko) ====

@@ -34,6 +34,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 

==== //depot/projects/pci/sys/dev/acpica/acpi_pcib_pci.c#2 (text+ko) ====

@@ -35,6 +35,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 

==== //depot/projects/pci/sys/dev/pci/pci_pci.c#8 (text+ko) ====

@@ -36,14 +36,16 @@
  */
 
 #include 
-#include 
+#include 
 #include 
+#include 
+#include 
 #include 
-#include 
-#include 
 #include 
 #include 
+#include 
 
+#include 
 #include 
 
 #include 
@@ -118,13 +120,13 @@
 
 	switch (type) {
 	case SYS_RES_IOPORT:
-		return (rman_is_region_manager(r, &sc->io_rman));
+		return (rman_is_region_manager(r, &sc->io.rman));
 	case SYS_RES_MEMORY:
 		/* Prefetchable resources may live in either memory rman. */
 		if (rman_get_flags(r) & RF_PREFETCHABLE &&
-		    rman_is_region_manager(r, &sc->pmem_rman))
+		    rman_is_region_manager(r, &sc->pmem.rman))
 			return (1);
-		return (rman_is_region_manager(r, &sc->mem_rman));
+		return (rman_is_region_manager(r, &sc->mem.rman));
 	}
 	return (0);
 }
@@ -138,8 +140,9 @@
 
 static void
 pcib_alloc_window(struct pcib_softc *sc, struct pcib_window *w, int type,
-    int flags, const char *name, pci_addr_t max_address)
+    int flags, pci_addr_t max_address)
 {
+	char buf[64];
 	int error, rid;
 
 	if (max_address != (u_long)max_address)
@@ -147,20 +150,20 @@
 	w->rman.rm_start = 0;
 	w->rman.rm_end = max_address;
 	w->rman.rm_type = RMAN_ARRAY;
-	w->rman.rm_descr = malloc(64, M_DEVBUF, M_WAITOK);
-	snprintf(w->rman.rm_descr, 64, "%s %s window",
-	    device_get_nameunit(sc->dev), name);
+	snprintf(buf, sizeof(buf), "%s %s window",
+	    device_get_nameunit(sc->dev), w->name);
+	w->rman.rm_descr = strdup(buf, M_DEVBUF);
 	error = rman_init(&w->rman);
 	if (error)
 		panic("Failed to initialize %s %s rman",
-		    device_get_nameunit(sc->dev), name);
+		    device_get_nameunit(sc->dev), w->name);
 
 	if (!pcib_is_window_open(w))
 		return;
 
 	if (w->base > max_address || w->limit > max_address) {
 		device_printf(sc->dev,
-		    "initial %s window has too many bits, ignoring\n", name);
+		    "initial %s window has too many bits, ignoring\n", w->name);
 		return;
 	}
 	rid = w->reg;
@@ -168,15 +171,15 @@
 	    w->limit - w->base + 1, flags);
 	if (w->res == NULL) {
 		device_printf(sc->dev,
-		    "failed to allocate initial %s window: %jx - %jx\n",
-		    name, (uintmax_t)w->base, (uintmax_t)w->limit);
+		    "failed to allocate initial %s window: %#jx-%#jx\n",
+		    w->name, (uintmax_t)w->base, (uintmax_t)w->limit);
 		return;
 	}
 
 	error = rman_manage_region(&w->rman, rman_get_start(w->res),
 	    rman_get_end(w->res));
 	if (error)
-		panic("Failed to initialize rman with resource");	
+		panic("Failed to initialize rman with resource");
 }
 
 /*
@@ -188,7 +191,6 @@
 	pci_addr_t max;
 	device_t dev;
 	uint32_t val;
-	int rid;
 
 	dev = sc->dev;
 
@@ -212,6 +214,7 @@
 		sc->io.reg = PCIR_IOBASEL_1;
 		sc->io.step = 12;
 		sc->io.mask = WIN_IO;
+		sc->io.name = "I/O port";
 		if ((val & PCIM_BRIO_MASK) == PCIM_BRIO_32) {
 			sc->io.base = PCI_PPBIOBASE(
 			    pci_read_config(dev, PCIR_IOBASEH_1, 2), val);
@@ -225,8 +228,7 @@
 			    pci_read_config(dev, PCIR_IOLIMITL_1, 1));
 			max = 0xffff;
 		}
-		pcib_alloc_window(sc, &sc->io, SYS_RES_IOPORT, 0, "I/O port",
-		    max);
+		pcib_alloc_window(sc, &sc->io, SYS_RES_IOPORT, 0, max);
 	}
 
 	/* Read the existing memory window. */
@@ -234,12 +236,12 @@
 	sc->mem.reg = PCIR_MEMBASE_1;
 	sc->mem.step = 20;
 	sc->mem.mask = WIN_MEM;
+	sc->mem.name = "memory";
 	sc->mem.base = PCI_PPBMEMBASE(0,
 	    pci_read_config(dev, PCIR_MEMBASE_1, 2));
 	sc->mem.limit = PCI_PPBMEMLIMIT(0,
 	    pci_read_config(dev, PCIR_MEMLIMIT_1, 2));
-	pcib_alloc_window(sc, &sc->mem, SYS_RES_MEMORY, 0, "memory",
-	    0xffffffff);
+	pcib_alloc_window(sc, &sc->mem, SYS_RES_MEMORY, 0, 0xffffffff);
 
 	/* Determine if the prefetchable memory window is implemented. */
 	val = pci_read_config(dev, PCIR_PMBASEL_1, 2);
@@ -260,22 +262,23 @@
 	if (sc->pmem.valid) {
 		sc->pmem.reg = PCIR_PMBASEL_1;
 		sc->pmem.step = 20;
-		sc->omem.mask = WIN_PMEM;
+		sc->pmem.mask = WIN_PMEM;
+		sc->pmem.name = "prefetch";
 		if ((val & PCIM_BRPM_MASK) == PCIM_BRPM_64) {
 			sc->pmem.base = PCI_PPBMEMBASE(
-			    pci_read_config(dev, PCIR_PMBASEH_1, 4), pmemlow);
+			    pci_read_config(dev, PCIR_PMBASEH_1, 4), val);
 			sc->pmem.limit = PCI_PPBMEMLIMIT(
 			    pci_read_config(dev, PCIR_PMLIMITH_1, 4),
 			    pci_read_config(dev, PCIR_PMLIMITL_1, 2));
 			max = 0xffffffffffffffff;
 		} else {
-			sc->pmem.base = PCI_PPBMEMBASE(0, pmemlow);
+			sc->pmem.base = PCI_PPBMEMBASE(0, val);
 			sc->pmem.limit = PCI_PPBMEMLIMIT(0,
 			    pci_read_config(dev, PCIR_PMLIMITL_1, 2));
 			max = 0xffffffff;
 		}
 		pcib_alloc_window(sc, &sc->pmem, SYS_RES_MEMORY,
-		    RF_PREFETCHABLE, "prefetchable memory", max);
+		    RF_PREFETCHABLE, max);
 	}
 }
 
@@ -616,7 +619,7 @@
 	sc->flags |= PCIB_SUBTRACTIVE;
 
 #ifdef NEW_PCIB
-    pcib_probe_windows();
+    pcib_probe_windows(sc);
 #endif
     if (bootverbose) {
 	device_printf(dev, "  domain            %d\n", sc->domain);
@@ -745,6 +748,18 @@
 }
 
 #ifdef NEW_PCIB
+static const char *
+pcib_child_name(device_t child)
+{
+	static char buf[64];
+
+	if (device_get_nameunit(child) != NULL)
+		return (device_get_nameunit(child));
+	snprintf(buf, sizeof(buf), "pci%d:%d:%d:%d", pci_get_domain(child),
+	    pci_get_bus(child), pci_get_slot(child), pci_get_function(child));
+	return (buf);
+}
+
 /*
  * Attempt to allocate a resource from the existing resources assigned
  * to a window.
@@ -759,11 +774,16 @@
 	if (!pcib_is_window_open(w))
 		return (NULL);
 
-	res = rman_reserve_resource(&w->rm, start, end, count,
+	res = rman_reserve_resource(&w->rman, start, end, count,
 	    flags & ~RF_ACTIVE, child);
 	if (res == NULL)
 		return (NULL);
 
+	if (bootverbose)
+		device_printf(sc->dev,
+		    "allocated %s range (%#lx-%#lx) for rid %x of %s\n",
+		    w->name, rman_get_start(res), rman_get_end(res), *rid,
+		    pcib_child_name(child));
 	rman_set_rid(res, *rid);
 
 	/*
@@ -796,8 +816,10 @@
 	 * Clamp the desired resource range to the maximum address
 	 * this window supports.  Reject impossible requests.
 	 */
-	if (end > w->max_address)
-		end = w->max_address;
+	if (!w->valid)
+		return (EINVAL);
+	if (end > w->rman.rm_end)
+		end = w->rman.rm_end;
 	if (start + count > end || start + count < start)
 		return (EINVAL);
 
@@ -819,6 +841,11 @@
 		    count, flags);
 		if (w->res == NULL)
 			return (ENXIO);
+		if (bootverbose)
+			device_printf(sc->dev,
+			    "allocated initial %s window of %#lx-%#lx\n",
+			    w->name, rman_get_start(w->res),
+			    rman_get_end(w->res));
 		goto updatewin;
 	}
 
@@ -836,9 +863,13 @@
 	 * request size is larger than w->res, we should find the
 	 * optimal aligned buffer containing w->res and allocate that.
 	 */
-	align = 1ul << RF_ALIGNMENT_MASK(flags);
+	if (bootverbose)
+		device_printf(sc->dev,
+		    "attempting to grow %s window for (%#lx-%#lx,%#lx)\n",
+		    w->name, start, end, count);
+	align = 1ul << RF_ALIGNMENT(flags);
 	if (start < rman_get_start(w->res)) {
-		if (rman_first_free_region(&w->rm, &start_free, &end_free) !=
+		if (rman_first_free_region(&w->rman, &start_free, &end_free) !=
 		    0 || start_free != rman_get_start(w->res))
 			end_free = rman_get_start(w->res) - 1;
 		if (end_free > end)
@@ -855,6 +886,9 @@
 		 * ok, ensure it is properly aligned for this window.
 		 */
 		if (front >= start) {
+			if (bootverbose)
+				printf("\tfront candidate range: %#lx-%#lx\n",
+				    front, end_free);
 			front &= (1ul << w->step) - 1;
 			front = rman_get_start(w->res) - front;
 		} else
@@ -862,12 +896,12 @@
 	} else
 		front = 0;
 	if (end > rman_get_end(w->res)) {
-		if (rman_last_free_region(&w->rm, &start_free, &end_free) !=
+		if (rman_last_free_region(&w->rman, &start_free, &end_free) !=
 		    0 || end_free != rman_get_end(w->res))
 			start_free = rman_get_end(w->res) + 1;
 		if (start_free < start)
 			start_free = start;
-		
+
 		/* Move start_free up until it is properly aligned. */
 		start_free = roundup2(start_free, align);
 		back = start_free + count;
@@ -879,6 +913,9 @@
 		 * ok, ensure it is properly aligned for this window.
 		 */
 		if (back <= end) {
+			if (bootverbose)
+				printf("\tback candidate range: %#lx-%#lx\n",
+				    start_free, back);
 			back = roundup2(back, w->step) - 1;
 			back -= rman_get_end(w->res);
 		} else
@@ -893,14 +930,14 @@
 	error = ENOSPC;
 	while (front != 0 || back != 0) {
 		if (front != 0 && (front <= back || back == 0)) {
-			error = bus_adjust_resource(sc->dev, w->type, w->res,
+			error = bus_adjust_resource(sc->dev, type, w->res,
 			    rman_get_start(w->res) - front,
 			    rman_get_end(w->res));
 			if (error == 0)
 				break;
 			front = 0;
 		} else {
-			error = bus_adjust_resource(sc->dev, w->type, w->res,
+			error = bus_adjust_resource(sc->dev, type, w->res,
 			    rman_get_start(w->res),
 			    rman_get_end(w->res) + back);
 			if (error == 0)
@@ -911,6 +948,9 @@
 
 	if (error)
 		return (error);
+	if (bootverbose)
+		device_printf(sc->dev, "grew %s window to %#lx-%#lx\n",
+		    w->name, rman_get_start(w->res), rman_get_end(w->res));
 
 updatewin:
 	/* Save the new window. */
@@ -918,7 +958,7 @@
 	w->limit = rman_get_end(w->res);
 	KASSERT((w->base & ((1ul << w->step) - 1)) == 0,
 	    ("start address is not aligned"));
-	KASSERT((w->end & ((1ul << w->step) - 1)) == (1ul << w->step) - 1,
+	KASSERT((w->limit & ((1ul << w->step) - 1)) == (1ul << w->step) - 1,
 	    ("end address is not aligned"));
 	pcib_write_windows(sc, w->mask);
 	return (0);
@@ -929,7 +969,7 @@
  * is set up to, or capable of handling them.
  */
 struct resource *
-pcib_alloc_resource(device_t dev, device_t child, int type, int *rid, 
+pcib_alloc_resource(device_t dev, device_t child, int type, int *rid,
     u_long start, u_long end, u_long count, u_int flags)
 {
 	struct pcib_softc *sc;
@@ -942,8 +982,8 @@
 	 * the bridge control register.  VGA resources do not fall into
 	 * the resource windows and are passed up to the parent.
 	 */
-	if (type == SYS_RES_IOPORT && pci_is_vga_ioport_range(start, end) ||
-	    type == SYS_RES_MEMORY && pci_is_vga_memory_range(start, end)) {
+	if ((type == SYS_RES_IOPORT && pci_is_vga_ioport_range(start, end)) ||
+	    (type == SYS_RES_MEMORY && pci_is_vga_memory_range(start, end))) {
 		if (sc->bridgectl & PCIB_BCR_VGA_ENABLE)
 			return (bus_generic_alloc_resource(dev, child, type,
 			    rid, start, end, count, flags));
@@ -956,8 +996,8 @@
 	 * ISA enable bit.
 	 */
 #ifdef notyet
-	if (type == SYS_RES_IOPORT && pci_is_isa_ioport_range(start, end) ||
-	    type == SYS_RES_MEMORY && pci_is_isa_memory_range(start, end)) {
+	if ((type == SYS_RES_IOPORT && pci_is_isa_ioport_range(start, end)) ||
+	    (type == SYS_RES_MEMORY && pci_is_isa_memory_range(start, end))) {
 		if (sc->bridgectl & PCIB_BCR_ISA_ENABLE)
 			return (bus_generic_alloc_resource(dev, child, type,
 			    rid, start, end, count, flags));
@@ -972,7 +1012,7 @@
 	 */
 	if (sc->flags & PCIB_SUBTRACTIVE)
 		return (bus_generic_alloc_resource(dev, child, type, rid,
-		    stat, end, count, flags));
+		    start, end, count, flags));
 #endif
 
 	switch (type) {
@@ -983,7 +1023,8 @@
 			break;
 #ifdef SUBTRACTIVE_WITH_WINDOWS
 		if (sc->flags & PCIB_SUBTRACTIVE)
-			break;
+			return (bus_generic_alloc_resource(dev, child, type,
+			    rid, start, end, count, flags));
 #endif
 		if (pcib_grow_window(sc, &sc->io, type, start, end, count,
 		    flags) == 0)
@@ -1011,7 +1052,8 @@
 			break;
 #ifdef SUBTRACTIVE_WITH_WINDOWS
 		if (sc->flags & PCIB_SUBTRACTIVE)
-			break;
+			return (bus_generic_alloc_resource(dev, child, type,
+			    rid, start, end, count, flags));
 #endif
 		if (flags & RF_PREFETCHABLE) {
 			if (pcib_grow_window(sc, &sc->pmem, type, start, end,
@@ -1029,7 +1071,7 @@
 		break;
 	default:
 		return (bus_generic_alloc_resource(dev, child, type, rid,
-		    stat, end, count, flags));
+		    start, end, count, flags));
 	}
 	return (r);
 }

==== //depot/projects/pci/sys/dev/pci/pcib_private.h#6 (text+ko) ====

@@ -53,6 +53,7 @@
     int		valid;
     int		mask;		/* WIN_* bitmask of this window */
     int		step;		/* log_2 of window granularity */
+    const char	*name;
 };
 #endif
 

==== //depot/projects/pci/sys/i386/pci/pci_bus.c#3 (text+ko) ====

@@ -35,6 +35,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 

==== //depot/projects/pci/sys/sparc64/pci/apb.c#2 (text+ko) ====

@@ -48,6 +48,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 

==== //depot/projects/pci/sys/sparc64/pci/ofw_pcib.c#2 (text+ko) ====

@@ -42,6 +42,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 

==== //depot/projects/pci/sys/x86/pci/qpi.c#2 (text+ko) ====

@@ -40,6 +40,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 

==== //depot/projects/pci/sys/x86/x86/mptable_pci.c#3 (text+ko) ====

@@ -40,6 +40,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 

From owner-p4-projects@FreeBSD.ORG  Tue Apr  5 20:40:09 2011
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0CF69106564A; Tue,  5 Apr 2011 20:40: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 DE4C71065672
	for ; Tue,  5 Apr 2011 20:40:06 +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 C5E4C8FC12
	for ; Tue,  5 Apr 2011 20:40: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 p35Ke63F030400
	for ; Tue, 5 Apr 2011 20:40:06 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p35Ke6kK030397
	for perforce@freebsd.org; Tue, 5 Apr 2011 20:40:06 GMT
	(envelope-from jhb@freebsd.org)
Date: Tue, 5 Apr 2011 20:40:06 GMT
Message-Id: <201104052040.p35Ke6kK030397@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 191079 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Tue, 05 Apr 2011 20:40:09 -0000

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

Change 191079 by jhb@jhb_jhbbsd on 2011/04/05 20:39:44

	Bah, fix PCI-PCI bridge window allocation.

Affected files ...

.. //depot/projects/pci/sys/dev/pci/pci.c#12 edit

Differences ...

==== //depot/projects/pci/sys/dev/pci/pci.c#12 (text+ko) ====

@@ -3956,13 +3956,14 @@
 			case PCIR_IOBASEL_1:
 			case PCIR_MEMBASE_1:
 			case PCIR_PMBASEL_1:
-				break;
-			default:
-				goto bar;
+				/*
+				 * XXX: Should we bother creating a resource
+				 * list entry?
+				 */
+				return (bus_generic_alloc_resource(dev, child,
+				    type, rid, start, end, count, flags));
 			}
-			break;
 		}
-	bar:
 #endif
 		/* Reserve resources for this BAR if needed. */
 		rle = resource_list_find(rl, type, *rid);

From owner-p4-projects@FreeBSD.ORG  Tue Apr  5 20:41:13 2011
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C2BCA1065676; Tue,  5 Apr 2011 20:41:12 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 857341065673
	for ; Tue,  5 Apr 2011 20:41:12 +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 3CCA28FC16
	for ; Tue,  5 Apr 2011 20:41:12 +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 p35KfCKH031996
	for ; Tue, 5 Apr 2011 20:41:12 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p35KfCiK031993
	for perforce@freebsd.org; Tue, 5 Apr 2011 20:41:12 GMT
	(envelope-from jhb@freebsd.org)
Date: Tue, 5 Apr 2011 20:41:12 GMT
Message-Id: <201104052041.p35KfCiK031993@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 191080 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Tue, 05 Apr 2011 20:41:13 -0000

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

Change 191080 by jhb@jhb_jhbbsd on 2011/04/05 20:40:09

	Gah, enable SUBTRACTIVE_WITH_WINDOWS by default.  I've already
	seen one in the wild.

Affected files ...

.. //depot/projects/pci/sys/dev/pci/pci_pci.c#9 edit

Differences ...

==== //depot/projects/pci/sys/dev/pci/pci_pci.c#9 (text+ko) ====

@@ -104,6 +104,20 @@
 
 #ifdef NEW_PCIB
 /*
+ * I have seen at least one of these in the wild:
+ *
+ * pcib9:  at device 30.0 on pci0
+ * pcib9:   domain            0
+ * pcib9:   secondary bus     9
+ * pcib9:   subordinate bus   9
+ * pcib9:   I/O decode        0x4000-0x4fff
+ * pcib9:   memory decode     0xda200000-0xda2fffff
+ * pcib9:   prefetched decode 0xd0000000-0xd7ffffff
+ * pcib9:   Subtractively decoded bridge.
+ */
+#define SUBTRACTIVE_WITH_WINDOWS
+
+/*
  * Is a resource from a child device sub-allocated from one of our
  * resource managers?
  */

From owner-p4-projects@FreeBSD.ORG  Wed Apr  6 19:17:29 2011
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 42DE51065670; Wed,  6 Apr 2011 19:17:29 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 057D6106566B
	for ; Wed,  6 Apr 2011 19:17:29 +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 E61368FC16
	for ; Wed,  6 Apr 2011 19:17:28 +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 p36JHSvP002018
	for ; Wed, 6 Apr 2011 19:17:28 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p36JHSnJ002015
	for perforce@freebsd.org; Wed, 6 Apr 2011 19:17:28 GMT
	(envelope-from jhb@freebsd.org)
Date: Wed, 6 Apr 2011 19:17:28 GMT
Message-Id: <201104061917.p36JHSnJ002015@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 191104 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 06 Apr 2011 19:17:29 -0000

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

Change 191104 by jhb@jhb_jhbbsd on 2011/04/06 19:16:53

	Fix a few bugs to get this to work when the PCI-PCI bridges are
	all purposefully sabotaged:
	- Fix an off-by-one error in the "is this allocation impossible"
	  check.
	- Properly mask off the right set of bits when aligning a new
	  candidate start address.
	- Add some more bootverbose printfs to help debug issues in the
	  future.
	- Actually update the rman to let it know about newly valid address
	  space when growing the window.
	- Check for underflow and overflow when calculating the front and
	  back regions and throw out the front or back attempt if it occurs.
	  (If it happens it means there isn't enough room at that end of
	  the window.)
	- Stubbed out code to sabotage the PCI-PCI bridges for testing.

Affected files ...

.. //depot/projects/pci/sys/dev/pci/pci_pci.c#10 edit

Differences ...

==== //depot/projects/pci/sys/dev/pci/pci_pci.c#10 (text+ko) ====

@@ -208,6 +208,20 @@
 
 	dev = sc->dev;
 
+#if 0
+	/* XXX: Gross hack, disable all windows for testing. */
+	pci_write_config(dev, PCIR_IOBASEL_1, 0xff, 1);
+	pci_write_config(dev, PCIR_IOBASEH_1, 0xffff, 2);
+	pci_write_config(dev, PCIR_IOLIMITL_1, 0, 1);
+	pci_write_config(dev, PCIR_IOLIMITH_1, 0, 2);
+	pci_write_config(dev, PCIR_MEMBASE_1, 0xffff, 2);
+	pci_write_config(dev, PCIR_MEMLIMIT_1, 0, 2);
+	pci_write_config(dev, PCIR_PMBASEL_1, 0xffff, 2);
+	pci_write_config(dev, PCIR_PMBASEH_1, 0xffffffff, 4);
+	pci_write_config(dev, PCIR_PMLIMITL_1, 0, 2);
+	pci_write_config(dev, PCIR_PMLIMITH_1, 0, 4);
+#endif
+
 	/* Determine if the I/O port window is implemented. */
 	val = pci_read_config(dev, PCIR_IOBASEL_1, 1);
 	if (val == 0) {
@@ -834,7 +848,7 @@
 		return (EINVAL);
 	if (end > w->rman.rm_end)
 		end = w->rman.rm_end;
-	if (start + count > end || start + count < start)
+	if (start + count - 1 > end || start + count < start)
 		return (EINVAL);
 
 	/*
@@ -846,20 +860,35 @@
 			flags &= ~RF_ALIGNMENT_MASK;
 			flags |= RF_ALIGNMENT_LOG2(w->step);
 		}
-		start &= ((1ul << w->step) - 1);
+		start &= ~((1ul << w->step) - 1);
 		end |= ((1ul << w->step) - 1);
-		if (count < (1ul << w->step))
-			count = 1ul << w->step;
+		count = roundup2(count, 1ul << w->step);
 		rid = w->reg;
 		w->res = bus_alloc_resource(sc->dev, type, &rid, start, end,
 		    count, flags);
-		if (w->res == NULL)
+		if (w->res == NULL) {
+			if (bootverbose)
+				device_printf(sc->dev,
+		    "failed to allocate initial %s window (%#lx-%#lx,%#lx)\n",
+				    w->name, start, end, count);
 			return (ENXIO);
+		}
 		if (bootverbose)
 			device_printf(sc->dev,
 			    "allocated initial %s window of %#lx-%#lx\n",
 			    w->name, rman_get_start(w->res),
 			    rman_get_end(w->res));
+		error = rman_manage_region(&w->rman, rman_get_start(w->res),
+		    rman_get_end(w->res));
+		if (error) {
+			if (bootverbose)
+				device_printf(sc->dev,
+				    "failed to add initial %s window to rman\n",
+				    w->name);
+			bus_release_resource(sc->dev, type, w->reg, w->res);
+			w->res = NULL;
+			return (error);
+		}
 		goto updatewin;
 	}
 
@@ -890,7 +919,7 @@
 			end_free = end;
 
 		/* Move end_free down until it is properly aligned. */
-		end_free &= (align - 1);
+		end_free &= ~(align - 1);
 		front = end_free - count;
 
 		/*
@@ -898,8 +927,9 @@
 		 * end_free).  Ensure that fits in the (start, end)
 		 * bounds.  end_free is checked above.  If 'front' is
 		 * ok, ensure it is properly aligned for this window.
+		 * Also check for underflow.
 		 */
-		if (front >= start) {
+		if (front >= start && front <= end_free) {
 			if (bootverbose)
 				printf("\tfront candidate range: %#lx-%#lx\n",
 				    front, end_free);
@@ -925,8 +955,9 @@
 		 * back).  Ensure that fits in the (start, end)
 		 * bounds.  start_free is checked above.  If 'back' is
 		 * ok, ensure it is properly aligned for this window.
+		 * Also check for overflow.
 		 */
-		if (back <= end) {
+		if (back <= end && start_free <= back) {
 			if (bootverbose)
 				printf("\tback candidate range: %#lx-%#lx\n",
 				    start_free, back);
@@ -966,6 +997,25 @@
 		device_printf(sc->dev, "grew %s window to %#lx-%#lx\n",
 		    w->name, rman_get_start(w->res), rman_get_end(w->res));
 
+	/* Add the newly allocated region to the resource manager. */
+	if (w->base != rman_get_start(w->res)) {
+		KASSERT(w->limit == rman_get_end(w->res), ("both ends moved"));
+		error = rman_manage_region(&w->rman, rman_get_start(w->res),
+		    w->base - 1);
+	} else {
+		KASSERT(w->limit != rman_get_end(w->res),
+		    ("neither end moved"));
+		error = rman_manage_region(&w->rman, w->limit + 1,
+		    rman_get_end(w->res));
+	}
+	if (error) {
+		if (bootverbose)
+			device_printf(sc->dev,
+			    "failed to expand %s resource manager\n", w->name);
+		bus_adjust_resource(sc->dev, type, w->res, w->base, w->limit);
+		return (error);
+	}
+
 updatewin:
 	/* Save the new window. */
 	w->base = rman_get_start(w->res);
@@ -1008,6 +1058,9 @@
 	/*
 	 * XXX: Need similar handling for ISA resources subject to the
 	 * ISA enable bit.
+	 *
+	 * XXX: Err, no.  What we need to do is block access to specific
+	 * I/O port ranges when ISA enable is set.
 	 */
 #ifdef notyet
 	if ((type == SYS_RES_IOPORT && pci_is_isa_ioport_range(start, end)) ||

From owner-p4-projects@FreeBSD.ORG  Wed Apr  6 19:30:40 2011
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2BB96106566C; Wed,  6 Apr 2011 19:30: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 E0F5E106566B
	for ; Wed,  6 Apr 2011 19:30:39 +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 CBD9C8FC1A
	for ; Wed,  6 Apr 2011 19:30: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 p36JUdqm003961
	for ; Wed, 6 Apr 2011 19:30:39 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p36JUbNV003941
	for perforce@freebsd.org; Wed, 6 Apr 2011 19:30:38 GMT
	(envelope-from jhb@freebsd.org)
Date: Wed, 6 Apr 2011 19:30:38 GMT
Message-Id: <201104061930.p36JUbNV003941@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 191105 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 06 Apr 2011 19:30:40 -0000

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

Change 191105 by jhb@jhb_jhbbsd on 2011/04/06 19:30:30

	IFC @191103

Affected files ...

.. //depot/projects/pci/sys/amd64/amd64/elf_machdep.c#2 integrate
.. //depot/projects/pci/sys/amd64/amd64/identcpu.c#2 integrate
.. //depot/projects/pci/sys/amd64/amd64/initcpu.c#2 integrate
.. //depot/projects/pci/sys/amd64/amd64/machdep.c#2 integrate
.. //depot/projects/pci/sys/amd64/amd64/minidump_machdep.c#2 integrate
.. //depot/projects/pci/sys/amd64/amd64/mp_machdep.c#2 integrate
.. //depot/projects/pci/sys/amd64/amd64/prof_machdep.c#2 integrate
.. //depot/projects/pci/sys/amd64/conf/GENERIC#2 integrate
.. //depot/projects/pci/sys/amd64/conf/NOTES#2 integrate
.. //depot/projects/pci/sys/amd64/ia32/ia32_misc.c#2 integrate
.. //depot/projects/pci/sys/amd64/ia32/ia32_signal.c#2 integrate
.. //depot/projects/pci/sys/amd64/ia32/ia32_sigtramp.S#2 integrate
.. //depot/projects/pci/sys/amd64/ia32/ia32_syscall.c#2 integrate
.. //depot/projects/pci/sys/amd64/include/clock.h#2 integrate
.. //depot/projects/pci/sys/amd64/include/cpu.h#2 integrate
.. //depot/projects/pci/sys/amd64/include/endian.h#2 integrate
.. //depot/projects/pci/sys/amd64/include/pmap.h#2 integrate
.. //depot/projects/pci/sys/amd64/include/smp.h#2 integrate
.. //depot/projects/pci/sys/amd64/linux32/Makefile#2 integrate
.. //depot/projects/pci/sys/amd64/linux32/linux.h#2 integrate
.. //depot/projects/pci/sys/amd64/linux32/linux32_dummy.c#2 integrate
.. //depot/projects/pci/sys/amd64/linux32/linux32_genassym.c#2 integrate
.. //depot/projects/pci/sys/amd64/linux32/linux32_proto.h#2 integrate
.. //depot/projects/pci/sys/amd64/linux32/linux32_syscall.h#2 integrate
.. //depot/projects/pci/sys/amd64/linux32/linux32_syscalls.c#1 branch
.. //depot/projects/pci/sys/amd64/linux32/linux32_sysent.c#2 integrate
.. //depot/projects/pci/sys/amd64/linux32/linux32_systrace_args.c#1 branch
.. //depot/projects/pci/sys/amd64/linux32/linux32_sysvec.c#2 integrate
.. //depot/projects/pci/sys/amd64/linux32/syscalls.conf#2 integrate
.. //depot/projects/pci/sys/amd64/linux32/syscalls.master#2 integrate
.. //depot/projects/pci/sys/arm/arm/elf_machdep.c#2 integrate
.. //depot/projects/pci/sys/arm/conf/AVILA#2 integrate
.. //depot/projects/pci/sys/arm/conf/CAMBRIA#2 integrate
.. //depot/projects/pci/sys/arm/econa/ehci_ebus.c#2 integrate
.. //depot/projects/pci/sys/arm/include/cpu.h#2 integrate
.. //depot/projects/pci/sys/arm/mv/gpio.c#2 integrate
.. //depot/projects/pci/sys/boot/common/Makefile.inc#2 integrate
.. //depot/projects/pci/sys/boot/common/bootstrap.h#2 integrate
.. //depot/projects/pci/sys/boot/common/load_elf.c#2 integrate
.. //depot/projects/pci/sys/boot/common/load_elf_obj.c#2 integrate
.. //depot/projects/pci/sys/boot/common/module.c#2 integrate
.. //depot/projects/pci/sys/boot/common/ufsread.c#2 integrate
.. //depot/projects/pci/sys/boot/efi/libefi/efipart.c#2 integrate
.. //depot/projects/pci/sys/boot/efi/libefi/libefi.c#2 integrate
.. //depot/projects/pci/sys/boot/forth/loader.conf#2 integrate
.. //depot/projects/pci/sys/boot/i386/boot2/Makefile#2 integrate
.. //depot/projects/pci/sys/boot/i386/boot2/boot2.c#2 integrate
.. //depot/projects/pci/sys/boot/i386/boot2/lib.h#2 integrate
.. //depot/projects/pci/sys/boot/i386/boot2/sio.S#2 integrate
.. //depot/projects/pci/sys/boot/i386/common/cons.c#2 integrate
.. //depot/projects/pci/sys/boot/i386/gptboot/Makefile#2 integrate
.. //depot/projects/pci/sys/boot/i386/zfsboot/Makefile#2 integrate
.. //depot/projects/pci/sys/boot/i386/zfsboot/zfsldr.S#2 integrate
.. //depot/projects/pci/sys/boot/ia64/common/bootinfo.c#2 integrate
.. //depot/projects/pci/sys/boot/ia64/common/copy.c#2 integrate
.. //depot/projects/pci/sys/boot/ia64/common/exec.c#2 integrate
.. //depot/projects/pci/sys/boot/ia64/common/libia64.h#2 integrate
.. //depot/projects/pci/sys/boot/ia64/efi/conf.c#2 integrate
.. //depot/projects/pci/sys/boot/ia64/efi/efimd.c#2 integrate
.. //depot/projects/pci/sys/boot/ia64/efi/main.c#2 integrate
.. //depot/projects/pci/sys/boot/ia64/efi/version#2 integrate
.. //depot/projects/pci/sys/boot/ia64/ski/conf.c#2 integrate
.. //depot/projects/pci/sys/boot/ia64/ski/efi_stub.c#2 integrate
.. //depot/projects/pci/sys/boot/ia64/ski/libski.h#2 integrate
.. //depot/projects/pci/sys/boot/ia64/ski/main.c#2 integrate
.. //depot/projects/pci/sys/boot/ia64/ski/skimd.c#2 integrate
.. //depot/projects/pci/sys/boot/ia64/ski/version#2 integrate
.. //depot/projects/pci/sys/boot/pc98/boot2/boot2.c#2 integrate
.. //depot/projects/pci/sys/boot/pc98/loader/main.c#2 integrate
.. //depot/projects/pci/sys/boot/sparc64/loader/main.c#2 integrate
.. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#2 integrate
.. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#2 integrate
.. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#2 integrate
.. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#2 integrate
.. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#2 integrate
.. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate
.. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#2 integrate
.. //depot/projects/pci/sys/cddl/dev/systrace/systrace.c#2 integrate
.. //depot/projects/pci/sys/compat/freebsd32/Makefile#2 integrate
.. //depot/projects/pci/sys/compat/freebsd32/freebsd32.h#2 integrate
.. //depot/projects/pci/sys/compat/freebsd32/freebsd32_ioctl.c#2 integrate
.. //depot/projects/pci/sys/compat/freebsd32/freebsd32_ioctl.h#2 integrate
.. //depot/projects/pci/sys/compat/freebsd32/freebsd32_misc.c#2 integrate
.. //depot/projects/pci/sys/compat/freebsd32/freebsd32_proto.h#2 integrate
.. //depot/projects/pci/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate
.. //depot/projects/pci/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate
.. //depot/projects/pci/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate
.. //depot/projects/pci/sys/compat/freebsd32/freebsd32_systrace_args.c#1 branch
.. //depot/projects/pci/sys/compat/freebsd32/syscalls.conf#2 integrate
.. //depot/projects/pci/sys/compat/freebsd32/syscalls.master#2 integrate
.. //depot/projects/pci/sys/compat/ia32/ia32_genassym.c#2 integrate
.. //depot/projects/pci/sys/compat/ia32/ia32_signal.h#2 integrate
.. //depot/projects/pci/sys/compat/ia32/ia32_sysvec.c#2 integrate
.. //depot/projects/pci/sys/compat/ia32/ia32_util.h#2 integrate
.. //depot/projects/pci/sys/compat/linprocfs/linprocfs.c#2 integrate
.. //depot/projects/pci/sys/compat/linux/linux_emul.c#2 integrate
.. //depot/projects/pci/sys/compat/linux/linux_emul.h#2 integrate
.. //depot/projects/pci/sys/compat/linux/linux_futex.c#2 integrate
.. //depot/projects/pci/sys/compat/linux/linux_ipc.c#2 integrate
.. //depot/projects/pci/sys/compat/linux/linux_mib.c#2 integrate
.. //depot/projects/pci/sys/compat/linux/linux_mib.h#2 integrate
.. //depot/projects/pci/sys/compat/linux/linux_misc.c#2 integrate
.. //depot/projects/pci/sys/compat/linux/linux_misc.h#2 integrate
.. //depot/projects/pci/sys/compat/linux/linux_socket.c#2 integrate
.. //depot/projects/pci/sys/compat/linux/linux_socket.h#2 integrate
.. //depot/projects/pci/sys/compat/svr4/svr4_sysvec.c#2 integrate
.. //depot/projects/pci/sys/compat/x86bios/x86bios.c#2 integrate
.. //depot/projects/pci/sys/conf/NOTES#2 integrate
.. //depot/projects/pci/sys/conf/files#2 integrate
.. //depot/projects/pci/sys/conf/files.ia64#2 integrate
.. //depot/projects/pci/sys/conf/files.mips#2 integrate
.. //depot/projects/pci/sys/conf/files.sparc64#2 integrate
.. //depot/projects/pci/sys/conf/files.sun4v#2 integrate
.. //depot/projects/pci/sys/conf/kern.pre.mk#2 integrate
.. //depot/projects/pci/sys/conf/ldscript.amd64#2 integrate
.. //depot/projects/pci/sys/conf/ldscript.ia64#2 integrate
.. //depot/projects/pci/sys/conf/options#3 integrate
.. //depot/projects/pci/sys/contrib/altq/altq/altq_cbq.c#2 integrate
.. //depot/projects/pci/sys/contrib/altq/altq/altq_cdnr.c#2 integrate
.. //depot/projects/pci/sys/contrib/altq/altq/altq_hfsc.c#2 integrate
.. //depot/projects/pci/sys/contrib/altq/altq/altq_priq.c#2 integrate
.. //depot/projects/pci/sys/contrib/altq/altq/altq_red.c#2 integrate
.. //depot/projects/pci/sys/contrib/altq/altq/altq_rio.c#2 integrate
.. //depot/projects/pci/sys/contrib/altq/altq/altq_rmclass.c#2 integrate
.. //depot/projects/pci/sys/contrib/altq/altq/altq_subr.c#2 integrate
.. //depot/projects/pci/sys/contrib/altq/altq/altq_var.h#2 integrate
.. //depot/projects/pci/sys/contrib/altq/altq/if_altq.h#2 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/changes.txt#2 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/common/dmtable.c#2 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/common/dmtbdump.c#2 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/common/dmtbinfo.c#2 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/compiler/aslcompiler.y#2 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/compiler/dtcompiler.h#2 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/compiler/dtio.c#2 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/compiler/dttable.c#2 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/compiler/dttemplate.h#2 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/compiler/dtutils.c#2 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/events/evmisc.c#2 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/events/evxfgpe.c#2 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/include/acdisasm.h#2 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/include/acglobal.h#2 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/include/acpixf.h#2 integrate
.. //depot/projects/pci/sys/contrib/dev/acpica/include/actbl2.h#2 integrate
.. //depot/projects/pci/sys/contrib/octeon-sdk/cvmx-fpa.h#2 integrate
.. //depot/projects/pci/sys/dev/acpica/acpi.c#2 integrate
.. //depot/projects/pci/sys/dev/acpica/acpi_timer.c#2 integrate
.. //depot/projects/pci/sys/dev/acpica/acpivar.h#2 integrate
.. //depot/projects/pci/sys/dev/ae/if_ae.c#2 integrate
.. //depot/projects/pci/sys/dev/age/if_age.c#2 integrate
.. //depot/projects/pci/sys/dev/agp/agp.c#2 integrate
.. //depot/projects/pci/sys/dev/ahci/ahci.c#2 integrate
.. //depot/projects/pci/sys/dev/aic7xxx/aic79xx.c#2 integrate
.. //depot/projects/pci/sys/dev/aic7xxx/aic79xx_pci.c#2 integrate
.. //depot/projects/pci/sys/dev/aic7xxx/aic7xxx.c#2 integrate
.. //depot/projects/pci/sys/dev/alc/if_alc.c#2 integrate
.. //depot/projects/pci/sys/dev/ale/if_ale.c#2 integrate
.. //depot/projects/pci/sys/dev/ata/ata-dma.c#2 integrate
.. //depot/projects/pci/sys/dev/ata/chipsets/ata-ahci.c#2 integrate
.. //depot/projects/pci/sys/dev/ata/chipsets/ata-siliconimage.c#2 integrate
.. //depot/projects/pci/sys/dev/ath/ah_osdep.c#2 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ah.c#2 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ah.h#2 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ah_diagcodes.h#2 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ah_eeprom.h#2 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ah_eeprom_v14.c#2 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ah_eeprom_v14.h#2 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ah_internal.h#2 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ah_regdomain.c#2 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ah_regdomain.h#1 branch
.. //depot/projects/pci/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_ctry.h#1 branch
.. //depot/projects/pci/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_domains.h#1 branch
.. //depot/projects/pci/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_freqbands.h#1 branch
.. //depot/projects/pci/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_regenum.h#1 branch
.. //depot/projects/pci/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_regmap.h#1 branch
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c#2 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c#2 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar5212/ar5212.h#2 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#2 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c#2 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar5212/ar5212_recv.c#2 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar5416/ar2133.c#2 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar5416/ar5416.h#2 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c#2 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#2 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c#2 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar5416/ar5416_cal.h#2 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c#2 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c#2 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar5416/ar5416_recv.c#2 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#2 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c#2 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar5416/ar5416reg.h#2 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar9001/ar9160.ini#2 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar9001/ar9160_attach.c#2 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar9002/ar9002phy.h#1 branch
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar9002/ar9280.c#2 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar9002/ar9280.h#2 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c#2 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar9002/ar9280_olc.c#1 branch
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar9002/ar9280_olc.h#1 branch
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar9002/ar9285.c#2 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar9002/ar9285.h#2 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c#2 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar9002/ar9285_cal.c#1 branch
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar9002/ar9285_cal.h#1 branch
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar9002/ar9285_reset.c#2 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar9002/ar9285phy.h#1 branch
.. //depot/projects/pci/sys/dev/ath/ath_rate/sample/sample.c#2 integrate
.. //depot/projects/pci/sys/dev/ath/if_ath.c#2 integrate
.. //depot/projects/pci/sys/dev/ath/if_ath_ahb.c#1 branch
.. //depot/projects/pci/sys/dev/ath/if_ath_pci.c#2 integrate
.. //depot/projects/pci/sys/dev/ath/if_ath_sysctl.c#2 integrate
.. //depot/projects/pci/sys/dev/ath/if_ath_tx.c#2 integrate
.. //depot/projects/pci/sys/dev/ath/if_ath_tx_ht.c#2 integrate
.. //depot/projects/pci/sys/dev/ath/if_athioctl.h#2 integrate
.. //depot/projects/pci/sys/dev/ath/if_athvar.h#2 integrate
.. //depot/projects/pci/sys/dev/bce/if_bce.c#2 integrate
.. //depot/projects/pci/sys/dev/bge/if_bge.c#2 integrate
.. //depot/projects/pci/sys/dev/bwn/if_bwn.c#2 integrate
.. //depot/projects/pci/sys/dev/bxe/bxe_debug.h#1 branch
.. //depot/projects/pci/sys/dev/bxe/bxe_fw_defs.h#1 branch
.. //depot/projects/pci/sys/dev/bxe/bxe_hsi.h#1 branch
.. //depot/projects/pci/sys/dev/bxe/bxe_include.h#1 branch
.. //depot/projects/pci/sys/dev/bxe/bxe_init.h#1 branch
.. //depot/projects/pci/sys/dev/bxe/bxe_init_values_e1.h#1 branch
.. //depot/projects/pci/sys/dev/bxe/bxe_init_values_e1h.h#1 branch
.. //depot/projects/pci/sys/dev/bxe/bxe_link.c#1 branch
.. //depot/projects/pci/sys/dev/bxe/bxe_link.h#1 branch
.. //depot/projects/pci/sys/dev/bxe/bxe_reg.h#1 branch
.. //depot/projects/pci/sys/dev/bxe/bxe_self_test.h#1 branch
.. //depot/projects/pci/sys/dev/bxe/dump_e1.h#1 branch
.. //depot/projects/pci/sys/dev/bxe/dump_e1h.h#1 branch
.. //depot/projects/pci/sys/dev/bxe/hw_dump_reg_st.h#1 branch
.. //depot/projects/pci/sys/dev/bxe/if_bxe.c#1 branch
.. //depot/projects/pci/sys/dev/bxe/if_bxe.h#1 branch
.. //depot/projects/pci/sys/dev/cxgb/common/cxgb_common.h#2 integrate
.. //depot/projects/pci/sys/dev/cxgb/common/cxgb_t3_hw.c#2 integrate
.. //depot/projects/pci/sys/dev/cxgb/cxgb_adapter.h#2 integrate
.. //depot/projects/pci/sys/dev/cxgb/cxgb_main.c#2 integrate
.. //depot/projects/pci/sys/dev/cxgb/cxgb_sge.c#2 integrate
.. //depot/projects/pci/sys/dev/cxgb/cxgb_t3fw.h#2 integrate
.. //depot/projects/pci/sys/dev/cxgbe/adapter.h#2 integrate
.. //depot/projects/pci/sys/dev/cxgbe/common/common.h#2 integrate
.. //depot/projects/pci/sys/dev/cxgbe/common/t4fw_interface.h#2 integrate
.. //depot/projects/pci/sys/dev/cxgbe/t4_main.c#2 integrate
.. //depot/projects/pci/sys/dev/cxgbe/t4_sge.c#2 integrate
.. //depot/projects/pci/sys/dev/dc/if_dc.c#2 integrate
.. //depot/projects/pci/sys/dev/drm/drm_agpsupport.c#2 integrate
.. //depot/projects/pci/sys/dev/e1000/e1000_82575.c#2 integrate
.. //depot/projects/pci/sys/dev/e1000/e1000_82575.h#2 integrate
.. //depot/projects/pci/sys/dev/e1000/e1000_defines.h#2 integrate
.. //depot/projects/pci/sys/dev/e1000/e1000_osdep.c#2 integrate
.. //depot/projects/pci/sys/dev/e1000/e1000_phy.c#2 integrate
.. //depot/projects/pci/sys/dev/e1000/if_em.c#2 integrate
.. //depot/projects/pci/sys/dev/e1000/if_em.h#2 integrate
.. //depot/projects/pci/sys/dev/e1000/if_igb.c#2 integrate
.. //depot/projects/pci/sys/dev/e1000/if_igb.h#2 integrate
.. //depot/projects/pci/sys/dev/e1000/if_lem.c#2 integrate
.. //depot/projects/pci/sys/dev/e1000/if_lem.h#2 integrate
.. //depot/projects/pci/sys/dev/et/if_et.c#2 integrate
.. //depot/projects/pci/sys/dev/firewire/fwohci.c#2 integrate
.. //depot/projects/pci/sys/dev/firewire/sbp.c#2 integrate
.. //depot/projects/pci/sys/dev/fxp/if_fxp.c#2 integrate
.. //depot/projects/pci/sys/dev/hptmv/hptproc.c#2 integrate
.. //depot/projects/pci/sys/dev/isp/isp_freebsd.h#2 integrate
.. //depot/projects/pci/sys/dev/isp/isp_pci.c#2 integrate
.. //depot/projects/pci/sys/dev/iwn/if_iwn.c#2 integrate
.. //depot/projects/pci/sys/dev/ixgbe/ixv.c#2 integrate
.. //depot/projects/pci/sys/dev/jme/if_jme.c#2 integrate
.. //depot/projects/pci/sys/dev/ksyms/ksyms.c#2 integrate
.. //depot/projects/pci/sys/dev/led/led.c#2 integrate
.. //depot/projects/pci/sys/dev/led/led.h#2 integrate
.. //depot/projects/pci/sys/dev/malo/if_malo_pci.c#2 integrate
.. //depot/projects/pci/sys/dev/mpt/mpt.c#2 integrate
.. //depot/projects/pci/sys/dev/mpt/mpt_cam.c#2 integrate
.. //depot/projects/pci/sys/dev/mpt/mpt_user.c#2 integrate
.. //depot/projects/pci/sys/dev/msk/if_msk.c#2 integrate
.. //depot/projects/pci/sys/dev/mvs/mvs_soc.c#2 integrate
.. //depot/projects/pci/sys/dev/mxge/if_mxge.c#2 integrate
.. //depot/projects/pci/sys/dev/nfe/if_nfe.c#2 integrate
.. //depot/projects/pci/sys/dev/nge/if_nge.c#2 integrate
.. //depot/projects/pci/sys/dev/nvram2env/nvram2env.c#1 branch
.. //depot/projects/pci/sys/dev/pci/hostb_pci.c#2 integrate
.. //depot/projects/pci/sys/dev/pci/pci.c#13 integrate
.. //depot/projects/pci/sys/dev/pci/pci_user.c#5 integrate
.. //depot/projects/pci/sys/dev/pci/pcireg.h#3 integrate
.. //depot/projects/pci/sys/dev/pci/pcivar.h#5 integrate
.. //depot/projects/pci/sys/dev/re/if_re.c#2 integrate
.. //depot/projects/pci/sys/dev/siba/siba_core.c#2 integrate
.. //depot/projects/pci/sys/dev/sis/if_sis.c#2 integrate
.. //depot/projects/pci/sys/dev/sk/if_sk.c#2 integrate
.. //depot/projects/pci/sys/dev/sound/pcm/buffer.c#2 integrate
.. //depot/projects/pci/sys/dev/ste/if_ste.c#2 integrate
.. //depot/projects/pci/sys/dev/stge/if_stge.c#2 integrate
.. //depot/projects/pci/sys/dev/streams/streams.c#2 integrate
.. //depot/projects/pci/sys/dev/ti/if_ti.c#2 integrate
.. //depot/projects/pci/sys/dev/ti/if_tireg.h#2 integrate
.. //depot/projects/pci/sys/dev/txp/if_txp.c#2 integrate
.. //depot/projects/pci/sys/dev/usb/controller/ehci.c#2 integrate
.. //depot/projects/pci/sys/dev/usb/controller/ehci_ixp4xx.c#2 integrate
.. //depot/projects/pci/sys/dev/usb/controller/ehci_mv.c#2 integrate
.. //depot/projects/pci/sys/dev/usb/controller/ehci_pci.c#2 integrate
.. //depot/projects/pci/sys/dev/usb/input/ums.c#2 integrate
.. //depot/projects/pci/sys/dev/usb/usb_generic.c#2 integrate
.. //depot/projects/pci/sys/dev/usb/usb_pf.c#2 integrate
.. //depot/projects/pci/sys/dev/usb/usb_pf.h#2 integrate
.. //depot/projects/pci/sys/dev/usb/usb_transfer.c#2 integrate
.. //depot/projects/pci/sys/dev/usb/usbdevs#2 integrate
.. //depot/projects/pci/sys/dev/usb/usbdi.h#2 integrate
.. //depot/projects/pci/sys/dev/usb/wlan/if_run.c#2 integrate
.. //depot/projects/pci/sys/dev/usb/wlan/if_zyd.c#2 integrate
.. //depot/projects/pci/sys/dev/vge/if_vge.c#2 integrate
.. //depot/projects/pci/sys/dev/vr/if_vr.c#2 integrate
.. //depot/projects/pci/sys/dev/vte/if_vte.c#2 integrate
.. //depot/projects/pci/sys/dev/vte/if_vtereg.h#2 integrate
.. //depot/projects/pci/sys/dev/vte/if_vtevar.h#2 integrate
.. //depot/projects/pci/sys/dev/xl/if_xl.c#2 integrate
.. //depot/projects/pci/sys/fs/msdosfs/msdosfs_lookup.c#2 integrate
.. //depot/projects/pci/sys/fs/nfsclient/nfs_clcomsubs.c#2 integrate
.. //depot/projects/pci/sys/fs/nfsclient/nfs_clport.c#2 integrate
.. //depot/projects/pci/sys/fs/nfsclient/nfs_clrpcops.c#2 integrate
.. //depot/projects/pci/sys/geom/eli/g_eli.c#2 integrate
.. //depot/projects/pci/sys/geom/gate/g_gate.c#2 integrate
.. //depot/projects/pci/sys/geom/gate/g_gate.h#2 integrate
.. //depot/projects/pci/sys/geom/geom.h#2 integrate
.. //depot/projects/pci/sys/geom/geom_dev.c#2 integrate
.. //depot/projects/pci/sys/geom/geom_disk.c#2 integrate
.. //depot/projects/pci/sys/geom/label/g_label_ext2fs.c#2 integrate
.. //depot/projects/pci/sys/geom/nop/g_nop.c#2 integrate
.. //depot/projects/pci/sys/geom/raid/g_raid.c#1 branch
.. //depot/projects/pci/sys/geom/raid/g_raid.h#1 branch
.. //depot/projects/pci/sys/geom/raid/g_raid_ctl.c#1 branch
.. //depot/projects/pci/sys/geom/raid/g_raid_md_if.m#1 branch
.. //depot/projects/pci/sys/geom/raid/g_raid_tr_if.m#1 branch
.. //depot/projects/pci/sys/geom/raid/md_intel.c#1 branch
.. //depot/projects/pci/sys/geom/raid/md_jmicron.c#1 branch
.. //depot/projects/pci/sys/geom/raid/md_nvidia.c#1 branch
.. //depot/projects/pci/sys/geom/raid/md_promise.c#1 branch
.. //depot/projects/pci/sys/geom/raid/md_sii.c#1 branch
.. //depot/projects/pci/sys/geom/raid/tr_concat.c#1 branch
.. //depot/projects/pci/sys/geom/raid/tr_raid0.c#1 branch
.. //depot/projects/pci/sys/geom/raid/tr_raid1.c#1 branch
.. //depot/projects/pci/sys/geom/raid/tr_raid1e.c#1 branch
.. //depot/projects/pci/sys/i386/conf/GENERIC#2 integrate
.. //depot/projects/pci/sys/i386/conf/PAE#2 integrate
.. //depot/projects/pci/sys/i386/i386/elf_machdep.c#2 integrate
.. //depot/projects/pci/sys/i386/i386/identcpu.c#2 integrate
.. //depot/projects/pci/sys/i386/i386/initcpu.c#2 integrate
.. //depot/projects/pci/sys/i386/i386/machdep.c#2 integrate
.. //depot/projects/pci/sys/i386/ibcs2/ibcs2_sysvec.c#2 integrate
.. //depot/projects/pci/sys/i386/include/clock.h#2 integrate
.. //depot/projects/pci/sys/i386/include/cpu.h#2 integrate
.. //depot/projects/pci/sys/i386/include/endian.h#2 integrate
.. //depot/projects/pci/sys/i386/include/vmparam.h#2 integrate
.. //depot/projects/pci/sys/i386/isa/prof_machdep.c#2 integrate
.. //depot/projects/pci/sys/i386/linux/Makefile#2 integrate
.. //depot/projects/pci/sys/i386/linux/linux.h#2 integrate
.. //depot/projects/pci/sys/i386/linux/linux_dummy.c#2 integrate
.. //depot/projects/pci/sys/i386/linux/linux_proto.h#2 integrate
.. //depot/projects/pci/sys/i386/linux/linux_syscall.h#2 integrate
.. //depot/projects/pci/sys/i386/linux/linux_syscalls.c#1 branch
.. //depot/projects/pci/sys/i386/linux/linux_sysent.c#2 integrate
.. //depot/projects/pci/sys/i386/linux/linux_systrace_args.c#1 branch
.. //depot/projects/pci/sys/i386/linux/linux_sysvec.c#2 integrate
.. //depot/projects/pci/sys/i386/linux/syscalls.conf#2 integrate
.. //depot/projects/pci/sys/i386/linux/syscalls.master#2 integrate
.. //depot/projects/pci/sys/ia64/conf/GENERIC#2 integrate
.. //depot/projects/pci/sys/ia64/ia32/ia32_misc.c#2 integrate
.. //depot/projects/pci/sys/ia64/ia32/ia32_signal.c#2 integrate
.. //depot/projects/pci/sys/ia64/ia64/autoconf.c#2 integrate
.. //depot/projects/pci/sys/ia64/ia64/db_machdep.c#2 integrate
.. //depot/projects/pci/sys/ia64/ia64/efi.c#2 integrate
.. //depot/projects/pci/sys/ia64/ia64/elf_machdep.c#2 integrate
.. //depot/projects/pci/sys/ia64/ia64/exception.S#2 integrate
.. //depot/projects/pci/sys/ia64/ia64/gdb_machdep.c#2 integrate
.. //depot/projects/pci/sys/ia64/ia64/genassym.c#2 integrate
.. //depot/projects/pci/sys/ia64/ia64/locore.S#2 integrate
.. //depot/projects/pci/sys/ia64/ia64/machdep.c#2 integrate
.. //depot/projects/pci/sys/ia64/ia64/pal.S#2 integrate
.. //depot/projects/pci/sys/ia64/ia64/physical.S#1 branch
.. //depot/projects/pci/sys/ia64/ia64/pmap.c#2 integrate
.. //depot/projects/pci/sys/ia64/ia64/support.S#2 integrate
.. //depot/projects/pci/sys/ia64/ia64/trap.c#2 integrate
.. //depot/projects/pci/sys/ia64/ia64/unaligned.c#2 integrate
.. //depot/projects/pci/sys/ia64/include/bootinfo.h#2 integrate
.. //depot/projects/pci/sys/ia64/include/efi.h#2 integrate
.. //depot/projects/pci/sys/ia64/include/pal.h#2 integrate
.. //depot/projects/pci/sys/ia64/include/pmap.h#2 integrate
.. //depot/projects/pci/sys/ia64/include/vmparam.h#2 integrate
.. //depot/projects/pci/sys/isa/pnp.c#2 integrate
.. //depot/projects/pci/sys/kern/imgact_aout.c#2 integrate
.. //depot/projects/pci/sys/kern/imgact_shell.c#2 integrate
.. //depot/projects/pci/sys/kern/init_main.c#2 integrate
.. //depot/projects/pci/sys/kern/init_sysent.c#2 integrate
.. //depot/projects/pci/sys/kern/kern_cpuset.c#2 integrate
.. //depot/projects/pci/sys/kern/kern_descrip.c#2 integrate
.. //depot/projects/pci/sys/kern/kern_event.c#2 integrate
.. //depot/projects/pci/sys/kern/kern_exit.c#2 integrate
.. //depot/projects/pci/sys/kern/kern_fork.c#2 integrate
.. //depot/projects/pci/sys/kern/kern_intr.c#2 integrate
.. //depot/projects/pci/sys/kern/kern_jail.c#2 integrate
.. //depot/projects/pci/sys/kern/kern_ktrace.c#2 integrate
.. //depot/projects/pci/sys/kern/kern_linker.c#2 integrate
.. //depot/projects/pci/sys/kern/kern_loginclass.c#1 branch
.. //depot/projects/pci/sys/kern/kern_malloc.c#2 integrate
.. //depot/projects/pci/sys/kern/kern_proc.c#2 integrate
.. //depot/projects/pci/sys/kern/kern_prot.c#2 integrate
.. //depot/projects/pci/sys/kern/kern_racct.c#1 branch
.. //depot/projects/pci/sys/kern/kern_rctl.c#1 branch
.. //depot/projects/pci/sys/kern/kern_resource.c#2 integrate
.. //depot/projects/pci/sys/kern/kern_sig.c#2 integrate
.. //depot/projects/pci/sys/kern/kern_sx.c#2 integrate
.. //depot/projects/pci/sys/kern/kern_sysctl.c#2 integrate
.. //depot/projects/pci/sys/kern/kern_thr.c#2 integrate
.. //depot/projects/pci/sys/kern/kern_thread.c#2 integrate
.. //depot/projects/pci/sys/kern/makesyscalls.sh#2 integrate
.. //depot/projects/pci/sys/kern/sched_4bsd.c#2 integrate
.. //depot/projects/pci/sys/kern/sched_ule.c#2 integrate
.. //depot/projects/pci/sys/kern/subr_acl_nfs4.c#2 integrate
.. //depot/projects/pci/sys/kern/subr_bus.c#4 integrate
.. //depot/projects/pci/sys/kern/subr_param.c#2 integrate
.. //depot/projects/pci/sys/kern/subr_uio.c#2 integrate
.. //depot/projects/pci/sys/kern/sys_capability.c#2 integrate
.. //depot/projects/pci/sys/kern/sys_pipe.c#2 integrate
.. //depot/projects/pci/sys/kern/syscalls.c#2 integrate
.. //depot/projects/pci/sys/kern/syscalls.master#2 integrate
.. //depot/projects/pci/sys/kern/systrace_args.c#2 integrate
.. //depot/projects/pci/sys/kern/tty_pts.c#2 integrate
.. //depot/projects/pci/sys/kern/uipc_mqueue.c#2 integrate
.. //depot/projects/pci/sys/kern/uipc_sem.c#2 integrate
.. //depot/projects/pci/sys/kern/uipc_shm.c#2 integrate
.. //depot/projects/pci/sys/kern/uipc_syscalls.c#2 integrate
.. //depot/projects/pci/sys/kern/vfs_cluster.c#2 integrate
.. //depot/projects/pci/sys/kern/vfs_mount.c#2 integrate
.. //depot/projects/pci/sys/kern/vfs_subr.c#2 integrate
.. //depot/projects/pci/sys/kern/vfs_syscalls.c#2 integrate
.. //depot/projects/pci/sys/mips/atheros/ar71xx_ehci.c#2 integrate
.. //depot/projects/pci/sys/mips/atheros/ar71xx_machdep.c#2 integrate
.. //depot/projects/pci/sys/mips/atheros/ar724x_chip.c#2 integrate
.. //depot/projects/pci/sys/mips/atheros/ar724xreg.h#2 integrate
.. //depot/projects/pci/sys/mips/atheros/ar91xx_chip.c#2 integrate
.. //depot/projects/pci/sys/mips/atheros/if_arge.c#2 integrate
.. //depot/projects/pci/sys/mips/atheros/if_argevar.h#2 integrate
.. //depot/projects/pci/sys/mips/cavium/if_octm.c#2 integrate
.. //depot/projects/pci/sys/mips/cavium/octe/ethernet-common.c#2 integrate
.. //depot/projects/pci/sys/mips/cavium/octe/ethernet-common.h#2 integrate
.. //depot/projects/pci/sys/mips/cavium/octe/ethernet.c#2 integrate
.. //depot/projects/pci/sys/mips/cavium/octe/octebus.c#2 integrate
.. //depot/projects/pci/sys/mips/cavium/octe/octebusvar.h#2 integrate
.. //depot/projects/pci/sys/mips/cavium/octe/wrapper-cvmx-includes.h#2 integrate
.. //depot/projects/pci/sys/mips/conf/AR71XX#2 integrate
.. //depot/projects/pci/sys/mips/conf/AR91XX_BASE#1 branch
.. //depot/projects/pci/sys/mips/conf/AR91XX_BASE.hints#1 branch
.. //depot/projects/pci/sys/mips/conf/IDT#2 integrate
.. //depot/projects/pci/sys/mips/conf/OCTEON1#2 integrate
.. //depot/projects/pci/sys/mips/conf/RT305X#1 branch
.. //depot/projects/pci/sys/mips/conf/RT305X.hints#1 branch
.. //depot/projects/pci/sys/mips/conf/SENTRY5#2 integrate
.. //depot/projects/pci/sys/mips/conf/TP-WN1043ND#1 branch
.. //depot/projects/pci/sys/mips/conf/TP-WN1043ND.hints#1 branch
.. //depot/projects/pci/sys/mips/include/cpuregs.h#2 integrate
.. //depot/projects/pci/sys/mips/mips/cpu.c#2 integrate
.. //depot/projects/pci/sys/mips/mips/elf64_machdep.c#2 integrate
.. //depot/projects/pci/sys/mips/mips/elf_machdep.c#2 integrate
.. //depot/projects/pci/sys/mips/rmi/xls_ehci.c#2 integrate
.. //depot/projects/pci/sys/mips/rt305x/files.rt305x#1 branch
.. //depot/projects/pci/sys/mips/rt305x/obio.c#1 branch
.. //depot/projects/pci/sys/mips/rt305x/obiovar.h#1 branch
.. //depot/projects/pci/sys/mips/rt305x/rt305x_dotg.c#1 branch
.. //depot/projects/pci/sys/mips/rt305x/rt305x_gpio.c#1 branch
.. //depot/projects/pci/sys/mips/rt305x/rt305x_gpio.h#1 branch
.. //depot/projects/pci/sys/mips/rt305x/rt305x_gpiovar.h#1 branch
.. //depot/projects/pci/sys/mips/rt305x/rt305x_ic.c#1 branch
.. //depot/projects/pci/sys/mips/rt305x/rt305x_icvar.h#1 branch
.. //depot/projects/pci/sys/mips/rt305x/rt305x_machdep.c#1 branch
.. //depot/projects/pci/sys/mips/rt305x/rt305x_sysctl.c#1 branch
.. //depot/projects/pci/sys/mips/rt305x/rt305x_sysctlvar.h#1 branch
.. //depot/projects/pci/sys/mips/rt305x/rt305xreg.h#1 branch
.. //depot/projects/pci/sys/mips/rt305x/rt_swreg.h#1 branch
.. //depot/projects/pci/sys/mips/rt305x/std.rt305x#1 branch
.. //depot/projects/pci/sys/mips/rt305x/uart_bus_rt305x.c#1 branch
.. //depot/projects/pci/sys/mips/rt305x/uart_cpu_rt305x.c#1 branch
.. //depot/projects/pci/sys/mips/rt305x/uart_dev_rt305x.c#1 branch
.. //depot/projects/pci/sys/mips/rt305x/uart_dev_rt305x.h#1 branch
.. //depot/projects/pci/sys/modules/Makefile#2 integrate
.. //depot/projects/pci/sys/modules/ath/Makefile#2 integrate
.. //depot/projects/pci/sys/modules/ath_ahb/Makefile#1 branch
.. //depot/projects/pci/sys/modules/ath_pci/Makefile#1 branch
.. //depot/projects/pci/sys/modules/bxe/Makefile#1 branch
.. //depot/projects/pci/sys/modules/cxgbe/Makefile#2 integrate
.. //depot/projects/pci/sys/modules/cxgbe/if_cxgbe/Makefile#1 branch
.. //depot/projects/pci/sys/modules/dtrace/Makefile#2 integrate
.. //depot/projects/pci/sys/modules/dtrace/dtraceall/Makefile#2 integrate
.. //depot/projects/pci/sys/modules/dtrace/dtraceall/dtraceall.c#2 integrate
.. //depot/projects/pci/sys/modules/dtrace/systrace_freebsd32/Makefile#1 branch
.. //depot/projects/pci/sys/modules/dtrace/systrace_linux32/Makefile#1 branch
.. //depot/projects/pci/sys/modules/geom/Makefile#2 integrate
.. //depot/projects/pci/sys/modules/geom/geom_raid/Makefile#1 branch
.. //depot/projects/pci/sys/modules/ipfw/Makefile#2 integrate
.. //depot/projects/pci/sys/modules/mlx4/Makefile#1 branch
.. //depot/projects/pci/sys/modules/mlx4ib/Makefile#1 branch
.. //depot/projects/pci/sys/modules/mlxen/Makefile#1 branch
.. //depot/projects/pci/sys/modules/mthca/Makefile#1 branch
.. //depot/projects/pci/sys/modules/ufs/Makefile#2 integrate
.. //depot/projects/pci/sys/net/if.c#2 integrate
.. //depot/projects/pci/sys/net/if_arp.h#2 integrate
.. //depot/projects/pci/sys/net/if_lagg.c#2 integrate
.. //depot/projects/pci/sys/net/if_llatbl.h#2 integrate
.. //depot/projects/pci/sys/net/if_types.h#2 integrate
.. //depot/projects/pci/sys/net/if_var.h#2 integrate
.. //depot/projects/pci/sys/net/if_vlan.c#2 integrate
.. //depot/projects/pci/sys/net/if_vlan_var.h#2 integrate
.. //depot/projects/pci/sys/net/route.c#2 integrate
.. //depot/projects/pci/sys/net/route.h#2 integrate
.. //depot/projects/pci/sys/net80211/_ieee80211.h#2 integrate
.. //depot/projects/pci/sys/net80211/ieee80211.c#2 integrate
.. //depot/projects/pci/sys/net80211/ieee80211_ht.c#2 integrate
.. //depot/projects/pci/sys/net80211/ieee80211_ht.h#2 integrate
.. //depot/projects/pci/sys/net80211/ieee80211_node.c#2 integrate
.. //depot/projects/pci/sys/net80211/ieee80211_output.c#2 integrate
.. //depot/projects/pci/sys/net80211/ieee80211_proto.c#2 integrate
.. //depot/projects/pci/sys/net80211/ieee80211_scan_sta.c#2 integrate
.. //depot/projects/pci/sys/net80211/ieee80211_sta.c#2 integrate
.. //depot/projects/pci/sys/net80211/ieee80211_var.h#2 integrate
.. //depot/projects/pci/sys/netgraph/ng_base.c#2 integrate
.. //depot/projects/pci/sys/netgraph/ng_iface.c#2 integrate
.. //depot/projects/pci/sys/netinet/if_ether.c#2 integrate
.. //depot/projects/pci/sys/netinet/in.c#2 integrate
.. //depot/projects/pci/sys/netinet/in_pcb.c#2 integrate
.. //depot/projects/pci/sys/netinet/in_pcb.h#2 integrate
.. //depot/projects/pci/sys/netinet/ipfw/ip_dn_glue.c#2 integrate
.. //depot/projects/pci/sys/netinet/ipfw/ip_dummynet.c#2 integrate
.. //depot/projects/pci/sys/netinet/ipfw/ip_fw2.c#2 integrate
.. //depot/projects/pci/sys/netinet/sctp.h#2 integrate
.. //depot/projects/pci/sys/netinet/sctp_cc_functions.c#2 integrate
.. //depot/projects/pci/sys/netinet/sctp_constants.h#2 integrate
.. //depot/projects/pci/sys/netinet/sctp_dtrace_declare.h#2 integrate
.. //depot/projects/pci/sys/netinet/sctp_dtrace_define.h#2 integrate
.. //depot/projects/pci/sys/netinet/sctp_indata.c#2 integrate
.. //depot/projects/pci/sys/netinet/sctp_input.c#2 integrate
.. //depot/projects/pci/sys/netinet/sctp_output.c#2 integrate
.. //depot/projects/pci/sys/netinet/sctp_pcb.c#2 integrate
.. //depot/projects/pci/sys/netinet/sctp_structs.h#2 integrate
.. //depot/projects/pci/sys/netinet/sctp_sysctl.c#2 integrate
.. //depot/projects/pci/sys/netinet/sctp_sysctl.h#2 integrate
.. //depot/projects/pci/sys/netinet/sctp_timer.c#2 integrate
.. //depot/projects/pci/sys/netinet/sctputil.c#2 integrate
.. //depot/projects/pci/sys/netinet/tcp_input.c#2 integrate
.. //depot/projects/pci/sys/netinet/tcp_sack.c#2 integrate
.. //depot/projects/pci/sys/netinet6/in6.c#2 integrate
.. //depot/projects/pci/sys/netinet6/in6_pcb.c#2 integrate
.. //depot/projects/pci/sys/netinet6/in6_src.c#2 integrate
.. //depot/projects/pci/sys/netinet6/nd6.c#2 integrate
.. //depot/projects/pci/sys/netinet6/nd6_nbr.c#2 integrate
.. //depot/projects/pci/sys/netinet6/udp6_usrreq.c#2 integrate
.. //depot/projects/pci/sys/netipsec/ipsec.h#2 integrate
.. //depot/projects/pci/sys/netipsec/ipsec_output.c#2 integrate
.. //depot/projects/pci/sys/netipsec/key.c#2 integrate
.. //depot/projects/pci/sys/netipsec/key.h#2 integrate
.. //depot/projects/pci/sys/netipsec/xform.h#2 integrate
.. //depot/projects/pci/sys/netipsec/xform_ah.c#2 integrate
.. //depot/projects/pci/sys/netipsec/xform_esp.c#2 integrate
.. //depot/projects/pci/sys/netipsec/xform_ipcomp.c#2 integrate
.. //depot/projects/pci/sys/ofed/drivers/infiniband/Kconfig#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/Makefile#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/core/Makefile#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/core/addr.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/core/agent.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/core/agent.h#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/core/cache.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/core/cm.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/core/cm_msgs.h#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/core/cma.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/core/core_priv.h#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/core/device.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/core/fmr_pool.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/core/iwcm.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/core/iwcm.h#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/core/local_sa.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/core/mad.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/core/mad_priv.h#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/core/mad_rmpp.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/core/mad_rmpp.h#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/core/multicast.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/core/notice.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/core/packer.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/core/sa.h#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/core/sa_query.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/core/smi.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/core/smi.h#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/core/sysfs.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/core/ucm.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/core/ucma.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/core/ud_header.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/core/umem.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/core/user_mad.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/core/uverbs.h#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/core/uverbs_cmd.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/core/uverbs_main.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/core/uverbs_marshall.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/core/verbs.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/debug/Makefile#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/debug/memtrack.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/debug/memtrack.h#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/debug/mtrack.h#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/hw/mlx4/Kconfig#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/hw/mlx4/Makefile#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/hw/mlx4/ah.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/hw/mlx4/cq.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/hw/mlx4/doorbell.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/hw/mlx4/mad.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/hw/mlx4/main.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_ib.h#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/hw/mlx4/mr.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/hw/mlx4/qp.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/hw/mlx4/srq.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/hw/mlx4/user.h#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/hw/mlx4/wc.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/hw/mlx4/wc.h#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/hw/mthca/Kconfig#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/hw/mthca/Makefile#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/hw/mthca/mthca_allocator.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/hw/mthca/mthca_av.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/hw/mthca/mthca_catas.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/hw/mthca/mthca_cmd.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/hw/mthca/mthca_cmd.h#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/hw/mthca/mthca_config_reg.h#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/hw/mthca/mthca_cq.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/hw/mthca/mthca_dev.h#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/hw/mthca/mthca_doorbell.h#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/hw/mthca/mthca_eq.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/hw/mthca/mthca_mad.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/hw/mthca/mthca_mcg.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/hw/mthca/mthca_memfree.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/hw/mthca/mthca_memfree.h#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/hw/mthca/mthca_mr.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/hw/mthca/mthca_pd.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/hw/mthca/mthca_profile.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/hw/mthca/mthca_profile.h#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/hw/mthca/mthca_provider.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/hw/mthca/mthca_provider.h#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/hw/mthca/mthca_qp.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/hw/mthca/mthca_reset.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/hw/mthca/mthca_srq.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/hw/mthca/mthca_uar.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/hw/mthca/mthca_user.h#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/hw/mthca/mthca_wqe.h#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/ulp/ipoib/Kconfig#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/ulp/ipoib/Makefile#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib.h#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_cm.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_fs.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ib.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_multicast.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_verbs.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_vlan.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/ulp/sdp/Kconfig#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/ulp/sdp/Makefile#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/ulp/sdp/sdp.h#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/ulp/sdp/sdp_bcopy.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/ulp/sdp/sdp_cma.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/ulp/sdp/sdp_dbg.h#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/ulp/sdp/sdp_proc.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/ulp/sdp/sdp_rx.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/ulp/sdp/sdp_tx.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/ulp/sdp/sdp_zcopy.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/util/Kconfig#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/util/Makefile#1 branch
.. //depot/projects/pci/sys/ofed/drivers/infiniband/util/madeye.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/net/mlx4/Makefile#1 branch
.. //depot/projects/pci/sys/ofed/drivers/net/mlx4/alloc.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/net/mlx4/catas.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/net/mlx4/cmd.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/net/mlx4/cq.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/net/mlx4/en_cq.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/net/mlx4/en_ethtool.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/net/mlx4/en_frag.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/net/mlx4/en_main.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/net/mlx4/en_netdev.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/net/mlx4/en_params.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/net/mlx4/en_port.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/net/mlx4/en_port.h#1 branch
.. //depot/projects/pci/sys/ofed/drivers/net/mlx4/en_resources.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/net/mlx4/en_rx.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/net/mlx4/en_selftest.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/net/mlx4/en_tx.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/net/mlx4/eq.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/net/mlx4/fw.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/net/mlx4/fw.h#1 branch
.. //depot/projects/pci/sys/ofed/drivers/net/mlx4/icm.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/net/mlx4/icm.h#1 branch
.. //depot/projects/pci/sys/ofed/drivers/net/mlx4/intf.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/net/mlx4/main.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/net/mlx4/mcg.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/net/mlx4/mlx4.h#1 branch
.. //depot/projects/pci/sys/ofed/drivers/net/mlx4/mlx4_en.h#1 branch
.. //depot/projects/pci/sys/ofed/drivers/net/mlx4/mr.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/net/mlx4/pd.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/net/mlx4/port.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/net/mlx4/profile.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/net/mlx4/qp.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/net/mlx4/reset.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/net/mlx4/sense.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/net/mlx4/srq.c#1 branch
.. //depot/projects/pci/sys/ofed/drivers/net/mlx4/xrcd.c#1 branch
.. //depot/projects/pci/sys/ofed/include/asm/atomic-long.h#1 branch
.. //depot/projects/pci/sys/ofed/include/asm/atomic.h#1 branch
.. //depot/projects/pci/sys/ofed/include/asm/byteorder.h#1 branch
.. //depot/projects/pci/sys/ofed/include/asm/current.h#1 branch
.. //depot/projects/pci/sys/ofed/include/asm/fcntl.h#1 branch
.. //depot/projects/pci/sys/ofed/include/asm/io.h#1 branch
.. //depot/projects/pci/sys/ofed/include/asm/page.h#1 branch
.. //depot/projects/pci/sys/ofed/include/asm/pgtable.h#1 branch
.. //depot/projects/pci/sys/ofed/include/asm/semaphore.h#1 branch
.. //depot/projects/pci/sys/ofed/include/asm/system.h#1 branch
.. //depot/projects/pci/sys/ofed/include/asm/types.h#1 branch
.. //depot/projects/pci/sys/ofed/include/asm/uaccess.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/bitmap.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/bitops.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/cdev.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/compat.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/compiler.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/completion.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/ctype.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/delay.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/device.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/dma-attrs.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/dma-mapping.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/dmapool.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/err.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/errno.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/ethtool.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/file.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/fs.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/gfp.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/hardirq.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/idr.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/if_arp.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/if_ether.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/if_vlan.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/in.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/in6.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/inet.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/inetdevice.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/init.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/interrupt.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/io-mapping.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/io.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/ioctl.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/jhash.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/jiffies.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/kdev_t.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/kernel.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/kobject.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/kref.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/kthread.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/linux_compat.c#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/linux_idr.c#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/linux_radix.c#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/list.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/lockdep.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/log2.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/miscdevice.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/mlx4/cmd.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/mlx4/cq.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/mlx4/device.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/mlx4/doorbell.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/mlx4/driver.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/mlx4/qp.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/mlx4/srq.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/mm.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/module.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/moduleparam.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/mount.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/mutex.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/net.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/netdevice.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/notifier.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/page.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/pci.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/poll.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/radix-tree.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/random.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/rbtree.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/rtnetlink.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/rwlock.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/rwsem.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/scatterlist.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/sched.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/semaphore.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/slab.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/socket.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/spinlock.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/stddef.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/string.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/sysfs.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/timer.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/types.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/uaccess.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/vmalloc.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/wait.h#1 branch
.. //depot/projects/pci/sys/ofed/include/linux/workqueue.h#1 branch
.. //depot/projects/pci/sys/ofed/include/net/addrconf.h#1 branch
.. //depot/projects/pci/sys/ofed/include/net/arp.h#1 branch
.. //depot/projects/pci/sys/ofed/include/net/ip.h#1 branch
.. //depot/projects/pci/sys/ofed/include/net/ip6_route.h#1 branch
.. //depot/projects/pci/sys/ofed/include/net/ipv6.h#1 branch
.. //depot/projects/pci/sys/ofed/include/net/neighbour.h#1 branch
.. //depot/projects/pci/sys/ofed/include/net/netevent.h#1 branch
.. //depot/projects/pci/sys/ofed/include/net/tcp.h#1 branch
.. //depot/projects/pci/sys/ofed/include/rdma/Kbuild#1 branch
.. //depot/projects/pci/sys/ofed/include/rdma/ib_addr.h#1 branch
.. //depot/projects/pci/sys/ofed/include/rdma/ib_cache.h#1 branch
.. //depot/projects/pci/sys/ofed/include/rdma/ib_cm.h#1 branch
.. //depot/projects/pci/sys/ofed/include/rdma/ib_fmr_pool.h#1 branch
.. //depot/projects/pci/sys/ofed/include/rdma/ib_mad.h#1 branch
.. //depot/projects/pci/sys/ofed/include/rdma/ib_marshall.h#1 branch
.. //depot/projects/pci/sys/ofed/include/rdma/ib_pack.h#1 branch
.. //depot/projects/pci/sys/ofed/include/rdma/ib_sa.h#1 branch
.. //depot/projects/pci/sys/ofed/include/rdma/ib_smi.h#1 branch
.. //depot/projects/pci/sys/ofed/include/rdma/ib_umem.h#1 branch
.. //depot/projects/pci/sys/ofed/include/rdma/ib_user_cm.h#1 branch
.. //depot/projects/pci/sys/ofed/include/rdma/ib_user_mad.h#1 branch
.. //depot/projects/pci/sys/ofed/include/rdma/ib_user_sa.h#1 branch
.. //depot/projects/pci/sys/ofed/include/rdma/ib_user_verbs.h#1 branch
.. //depot/projects/pci/sys/ofed/include/rdma/ib_verbs.h#1 branch
.. //depot/projects/pci/sys/ofed/include/rdma/iw_cm.h#1 branch
.. //depot/projects/pci/sys/ofed/include/rdma/rdma_cm.h#1 branch
.. //depot/projects/pci/sys/ofed/include/rdma/rdma_cm_ib.h#1 branch
.. //depot/projects/pci/sys/ofed/include/rdma/rdma_user_cm.h#1 branch
.. //depot/projects/pci/sys/ofed/include/rdma/sdp_socket.h#1 branch
.. //depot/projects/pci/sys/opencrypto/cryptodev.c#2 integrate
.. //depot/projects/pci/sys/pc98/conf/GENERIC#2 integrate
.. //depot/projects/pci/sys/pc98/pc98/machdep.c#2 integrate
.. //depot/projects/pci/sys/pci/if_rl.c#2 integrate
.. //depot/projects/pci/sys/powerpc/aim/machdep.c#2 integrate
.. //depot/projects/pci/sys/powerpc/include/frame.h#2 integrate
.. //depot/projects/pci/sys/powerpc/ofw/ofw_machdep.c#2 integrate
.. //depot/projects/pci/sys/powerpc/powermac/smu.c#2 integrate
.. //depot/projects/pci/sys/powerpc/powerpc/elf32_machdep.c#2 integrate
.. //depot/projects/pci/sys/powerpc/powerpc/elf64_machdep.c#2 integrate
.. //depot/projects/pci/sys/security/mac/mac_syscalls.c#2 integrate
.. //depot/projects/pci/sys/sparc64/conf/GENERIC#2 integrate
.. //depot/projects/pci/sys/sparc64/ebus/ebus.c#2 integrate
.. //depot/projects/pci/sys/sparc64/ebus/ebusreg.h#2 integrate
.. //depot/projects/pci/sys/sparc64/include/_inttypes.h#2 integrate
.. //depot/projects/pci/sys/sparc64/include/_stdint.h#2 integrate
.. //depot/projects/pci/sys/sparc64/include/bus.h#2 integrate
.. //depot/projects/pci/sys/sparc64/include/bus_dma.h#2 integrate
.. //depot/projects/pci/sys/sparc64/include/iommuvar.h#2 integrate
.. //depot/projects/pci/sys/sparc64/include/ofw_nexus.h#2 integrate
.. //depot/projects/pci/sys/sparc64/include/varargs.h#2 integrate
.. //depot/projects/pci/sys/sparc64/include/vmparam.h#2 integrate
.. //depot/projects/pci/sys/sparc64/isa/ofw_isa.c#2 integrate
.. //depot/projects/pci/sys/sparc64/isa/ofw_isa.h#2 integrate
.. //depot/projects/pci/sys/sparc64/pci/fire.c#2 integrate
.. //depot/projects/pci/sys/sparc64/pci/ofw_pci.h#2 integrate
.. //depot/projects/pci/sys/sparc64/pci/ofw_pci_if.m#2 integrate
.. //depot/projects/pci/sys/sparc64/pci/ofw_pcibus.c#2 integrate
.. //depot/projects/pci/sys/sparc64/pci/psycho.c#2 integrate
.. //depot/projects/pci/sys/sparc64/pci/psychoreg.h#2 integrate
.. //depot/projects/pci/sys/sparc64/pci/psychovar.h#2 integrate
.. //depot/projects/pci/sys/sparc64/pci/schizo.c#2 integrate
.. //depot/projects/pci/sys/sparc64/pci/schizoreg.h#2 integrate
.. //depot/projects/pci/sys/sparc64/pci/schizovar.h#2 integrate
.. //depot/projects/pci/sys/sparc64/sbus/dma_sbus.c#2 integrate
.. //depot/projects/pci/sys/sparc64/sbus/lsi64854.c#2 integrate
.. //depot/projects/pci/sys/sparc64/sbus/lsi64854reg.h#2 integrate
.. //depot/projects/pci/sys/sparc64/sbus/lsi64854var.h#2 integrate
.. //depot/projects/pci/sys/sparc64/sbus/ofw_sbus.h#2 integrate
.. //depot/projects/pci/sys/sparc64/sbus/sbus.c#2 integrate
.. //depot/projects/pci/sys/sparc64/sbus/sbusvar.h#2 integrate
.. //depot/projects/pci/sys/sparc64/sparc64/bus_machdep.c#2 integrate
.. //depot/projects/pci/sys/sparc64/sparc64/elf_machdep.c#2 integrate
.. //depot/projects/pci/sys/sparc64/sparc64/iommu.c#2 integrate
.. //depot/projects/pci/sys/sparc64/sparc64/machdep.c#2 integrate
.. //depot/projects/pci/sys/sparc64/sparc64/pmap.c#2 integrate
.. //depot/projects/pci/sys/sparc64/sparc64/tick.c#2 integrate
.. //depot/projects/pci/sys/sparc64/sparc64/trap.c#2 integrate
.. //depot/projects/pci/sys/sparc64/sparc64/vm_machdep.c#2 integrate
.. //depot/projects/pci/sys/sun4v/conf/GENERIC#2 integrate
.. //depot/projects/pci/sys/sun4v/include/_inttypes.h#2 integrate
.. //depot/projects/pci/sys/sun4v/include/_stdint.h#2 integrate
.. //depot/projects/pci/sys/sun4v/include/bus.h#2 integrate
.. //depot/projects/pci/sys/sun4v/include/bus_dma.h#2 integrate
.. //depot/projects/pci/sys/sun4v/include/ofw_nexus.h#2 integrate
.. //depot/projects/pci/sys/sun4v/include/varargs.h#2 integrate
.. //depot/projects/pci/sys/sun4v/include/vmparam.h#2 integrate
.. //depot/projects/pci/sys/sun4v/sun4v/bus_machdep.c#2 integrate
.. //depot/projects/pci/sys/sun4v/sun4v/hviommu.c#2 integrate
.. //depot/projects/pci/sys/sun4v/sun4v/machdep.c#2 integrate
.. //depot/projects/pci/sys/sun4v/sun4v/trap.c#2 integrate
.. //depot/projects/pci/sys/sun4v/sun4v/vm_machdep.c#2 integrate
.. //depot/projects/pci/sys/sys/acl.h#2 integrate
.. //depot/projects/pci/sys/sys/bus.h#3 integrate
.. //depot/projects/pci/sys/sys/errno.h#2 integrate
.. //depot/projects/pci/sys/sys/eventhandler.h#2 integrate
.. //depot/projects/pci/sys/sys/fcntl.h#2 integrate
.. //depot/projects/pci/sys/sys/file.h#2 integrate
.. //depot/projects/pci/sys/sys/filedesc.h#2 integrate
.. //depot/projects/pci/sys/sys/interrupt.h#2 integrate
.. //depot/projects/pci/sys/sys/jail.h#2 integrate
.. //depot/projects/pci/sys/sys/kernel.h#2 integrate
.. //depot/projects/pci/sys/sys/limits.h#2 integrate
.. //depot/projects/pci/sys/sys/loginclass.h#1 branch
.. //depot/projects/pci/sys/sys/param.h#2 integrate
.. //depot/projects/pci/sys/sys/priv.h#2 integrate
.. //depot/projects/pci/sys/sys/proc.h#2 integrate
.. //depot/projects/pci/sys/sys/racct.h#1 branch
.. //depot/projects/pci/sys/sys/rctl.h#1 branch
.. //depot/projects/pci/sys/sys/resourcevar.h#2 integrate
.. //depot/projects/pci/sys/sys/sx.h#2 integrate
.. //depot/projects/pci/sys/sys/syscall.h#2 integrate
.. //depot/projects/pci/sys/sys/syscall.mk#2 integrate
.. //depot/projects/pci/sys/sys/syscallsubr.h#2 integrate
.. //depot/projects/pci/sys/sys/sysctl.h#2 integrate
.. //depot/projects/pci/sys/sys/sysent.h#2 integrate
.. //depot/projects/pci/sys/sys/sysproto.h#2 integrate
.. //depot/projects/pci/sys/sys/systm.h#2 integrate
.. //depot/projects/pci/sys/sys/ucred.h#2 integrate
.. //depot/projects/pci/sys/sys/uio.h#2 integrate
.. //depot/projects/pci/sys/sys/user.h#2 integrate
.. //depot/projects/pci/sys/tools/fw_stub.awk#2 integrate
.. //depot/projects/pci/sys/ufs/ffs/ffs_alloc.c#2 integrate
.. //depot/projects/pci/sys/ufs/ffs/ffs_extern.h#2 integrate
.. //depot/projects/pci/sys/ufs/ffs/ffs_softdep.c#2 integrate
.. //depot/projects/pci/sys/ufs/ffs/ffs_vfsops.c#2 integrate
.. //depot/projects/pci/sys/ufs/ufs/dirhash.h#2 integrate
.. //depot/projects/pci/sys/ufs/ufs/ufs_dirhash.c#2 integrate
.. //depot/projects/pci/sys/ufs/ufs/ufs_lookup.c#2 integrate
.. //depot/projects/pci/sys/ufs/ufs/ufs_quota.c#2 integrate
.. //depot/projects/pci/sys/ufs/ufs/ufsmount.h#2 integrate
.. //depot/projects/pci/sys/vm/device_pager.c#2 integrate
.. //depot/projects/pci/sys/vm/sg_pager.c#2 integrate
.. //depot/projects/pci/sys/vm/uma_core.c#2 integrate
.. //depot/projects/pci/sys/vm/vm_fault.c#2 integrate
.. //depot/projects/pci/sys/vm/vm_map.c#2 integrate
.. //depot/projects/pci/sys/vm/vm_map.h#2 integrate
.. //depot/projects/pci/sys/vm/vm_meter.c#2 integrate
.. //depot/projects/pci/sys/vm/vm_page.c#2 integrate
.. //depot/projects/pci/sys/vm/vm_page.h#2 integrate
.. //depot/projects/pci/sys/vm/vm_pageout.c#2 integrate
.. //depot/projects/pci/sys/x86/isa/clock.c#2 integrate
.. //depot/projects/pci/sys/x86/x86/tsc.c#2 integrate

Differences ...

==== //depot/projects/pci/sys/amd64/amd64/elf_machdep.c#2 (text+ko) ====

@@ -24,7 +24,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.35 2011/01/08 16:13:44 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.36 2011/03/08 19:01:45 dchagin Exp $");
 
 #include 
 #include 
@@ -81,6 +81,7 @@
 	.sv_syscallnames = syscallnames,
 	.sv_shared_page_base = SHAREDPAGE,
 	.sv_shared_page_len = PAGE_SIZE,
+	.sv_schedtail	= NULL,
 };
 INIT_SYSENTVEC(elf64_sysvec, &elf64_freebsd_sysvec);
 

==== //depot/projects/pci/sys/amd64/amd64/identcpu.c#2 (text+ko) ====

@@ -39,7 +39,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.186 2010/12/07 22:43:25 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.188 2011/03/26 02:02:07 jkim Exp $");
 
 #include "opt_cpu.h"
 
@@ -193,10 +193,12 @@
 	printf("%s (", cpu_model);
 	switch(cpu_class) {
 	case CPUCLASS_K8:
-		hw_clockrate = (tsc_freq + 5000) / 1000000;
-		printf("%jd.%02d-MHz ",
-		       (intmax_t)(tsc_freq + 4999) / 1000000,
-		       (u_int)((tsc_freq + 4999) / 10000) % 100);
+		if (tsc_freq != 0) {
+			hw_clockrate = (tsc_freq + 5000) / 1000000;
+			printf("%jd.%02d-MHz ",
+			       (intmax_t)(tsc_freq + 4999) / 1000000,

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

From owner-p4-projects@FreeBSD.ORG  Wed Apr  6 19:55:56 2011
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4A7781065672; Wed,  6 Apr 2011 19:55:56 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0D31A106566B
	for ; Wed,  6 Apr 2011 19:55:56 +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 EE16E8FC14
	for ; Wed,  6 Apr 2011 19:55:55 +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 p36JttWG009134
	for ; Wed, 6 Apr 2011 19:55:55 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p36JttkD009131
	for perforce@freebsd.org; Wed, 6 Apr 2011 19:55:55 GMT
	(envelope-from jhb@freebsd.org)
Date: Wed, 6 Apr 2011 19:55:55 GMT
Message-Id: <201104061955.p36JttkD009131@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 191107 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 06 Apr 2011 19:55:56 -0000

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

Change 191107 by jhb@jhb_jhbbsd on 2011/04/06 19:54:51

	- Purge some old cruft.  Enable SUBTRACTIVE_WITH_WINDOWS by default
	  and remove support for not using it.  These bridges do exist.
	- Add a new SUBTRACTIVE_GROW_WINDOWS knob and enable it by default
	  that causes subtractive PCI-PCI bridges to still try to grow
	  windows like other PCI-PCI bridges.  Now what happens is that if
	  all of the normal route for allocating resources fails and the
	  bridge is subtractive, then we will just pass the request up the
	  tree.  With this change, the driver now allocates all the same
	  windows as the BIOS on my test machine.
	- Remove completely wrong commented out code about the ISA enable
	  bit and add a todo item to describe what proper ISA enable support
	  would really entail.

Affected files ...

.. //depot/projects/pci/sys/dev/pci/pci_pci.c#11 edit

Differences ...

==== //depot/projects/pci/sys/dev/pci/pci_pci.c#11 (text+ko) ====

@@ -104,18 +104,15 @@
 
 #ifdef NEW_PCIB
 /*
- * I have seen at least one of these in the wild:
- *
- * pcib9:  at device 30.0 on pci0
- * pcib9:   domain            0
- * pcib9:   secondary bus     9
- * pcib9:   subordinate bus   9
- * pcib9:   I/O decode        0x4000-0x4fff
- * pcib9:   memory decode     0xda200000-0xda2fffff
- * pcib9:   prefetched decode 0xd0000000-0xd7ffffff
- * pcib9:   Subtractively decoded bridge.
+ * NEW_PCIB todo:
+ * - test SUBTRACTIVE_GROW_WINDOWS and see if that should be the default
+ *   behavior
+ * - properly handle the ISA enable bit.  If it is set, we should change
+ *   the behavior of the I/O window resource and rman to not allocate the
+ *   blocked ranges (upper 768 bytes of each 1K in the first 64k of the
+ *   I/O port address space).
  */
-#define SUBTRACTIVE_WITH_WINDOWS
+#define SUBTRACTIVE_GROW_WINDOWS
 
 /*
  * Is a resource from a child device sub-allocated from one of our
@@ -125,13 +122,6 @@
 pcib_is_resource_managed(struct pcib_softc *sc, int type, struct resource *r)
 {
 
-	/* XXX: Can subtractive bridges still use windows? */
-#ifndef SUBTRACTIVE_WITH_WINDOWS
-	/* Subtractive bridges don't manage resources. */
-	if (sc->flags & PCIB_SUBTRACTIVE)
-		return (0);
-#endif
-
 	switch (type) {
 	case SYS_RES_IOPORT:
 		return (rman_is_region_manager(r, &sc->io.rman));
@@ -1055,40 +1045,13 @@
 			return (NULL);
 	}
 
-	/*
-	 * XXX: Need similar handling for ISA resources subject to the
-	 * ISA enable bit.
-	 *
-	 * XXX: Err, no.  What we need to do is block access to specific
-	 * I/O port ranges when ISA enable is set.
-	 */
-#ifdef notyet
-	if ((type == SYS_RES_IOPORT && pci_is_isa_ioport_range(start, end)) ||
-	    (type == SYS_RES_MEMORY && pci_is_isa_memory_range(start, end))) {
-		if (sc->bridgectl & PCIB_BCR_ISA_ENABLE)
-			return (bus_generic_alloc_resource(dev, child, type,
-			    rid, start, end, count, flags));
-		else
-			return (NULL);
-	}
-#endif
-
-#ifndef SUBTRACTIVE_WITH_WINDOWS
-	/*
-	 * XXX: What to do about subtractive bridges?  Do they have windows?
-	 */
-	if (sc->flags & PCIB_SUBTRACTIVE)
-		return (bus_generic_alloc_resource(dev, child, type, rid,
-		    start, end, count, flags));
-#endif
-
 	switch (type) {
 	case SYS_RES_IOPORT:
 		r = pcib_suballoc_resource(sc, &sc->io, child, type, rid, start,
 		    end, count, flags);
 		if (r != NULL)
 			break;
-#ifdef SUBTRACTIVE_WITH_WINDOWS
+#ifndef SUBTRACTIVE_GROW_WINDOWS
 		if (sc->flags & PCIB_SUBTRACTIVE)
 			return (bus_generic_alloc_resource(dev, child, type,
 			    rid, start, end, count, flags));
@@ -1117,7 +1080,7 @@
 		    start, end, count, flags);
 		if (r != NULL)
 			break;
-#ifdef SUBTRACTIVE_WITH_WINDOWS
+#ifndef SUBTRACTIVE_GROW_WINDOWS
 		if (sc->flags & PCIB_SUBTRACTIVE)
 			return (bus_generic_alloc_resource(dev, child, type,
 			    rid, start, end, count, flags));
@@ -1140,6 +1103,16 @@
 		return (bus_generic_alloc_resource(dev, child, type, rid,
 		    start, end, count, flags));
 	}
+
+#ifdef SUBTRACTIVE_GROW_WINDOWS
+	/*
+	 * If attempts to suballocate from the window fail but this is a
+	 * subtractive bridge, pass the request up the tree.
+	 */
+	if (sc->flags & PCIB_SUBTRACTIVE && r == NULL)
+		return (bus_generic_alloc_resource(dev, child, type, rid,
+		    start, end, count, flags));
+#endif
 	return (r);
 }
 #else

From owner-p4-projects@FreeBSD.ORG  Thu Apr  7 18:10:46 2011
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0A36E1065674; Thu,  7 Apr 2011 18:10:46 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BC9291065673
	for ; Thu,  7 Apr 2011 18:10:45 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id AA0318FC17
	for ; Thu,  7 Apr 2011 18:10:45 +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 p37IAjV5058922
	for ; Thu, 7 Apr 2011 18:10:45 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p37IAg2b058842
	for perforce@freebsd.org; Thu, 7 Apr 2011 18:10:42 GMT
	(envelope-from trasz@freebsd.org)
Date: Thu, 7 Apr 2011 18:10:42 GMT
Message-Id: <201104071810.p37IAg2b058842@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 191154 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, 07 Apr 2011 18:10:46 -0000

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

Change 191154 by trasz@trasz_victim on 2011/04/07 18:10:05

	IFC.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/Makefile.inc1#25 integrate
.. //depot/projects/soc2009/trasz_limits/etc/mtree/BSD.include.dist#12 integrate
.. //depot/projects/soc2009/trasz_limits/include/Makefile#14 integrate
.. //depot/projects/soc2009/trasz_limits/include/histedit.h#3 delete
.. //depot/projects/soc2009/trasz_limits/lib/libc/gen/errlst.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/string/strerror.3#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/string/strerror.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libdevstat/devstat.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libedit/Makefile#5 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libedit/chartype.h#1 branch
.. //depot/projects/soc2009/trasz_limits/lib/libedit/edit/readline/Makefile#1 branch
.. //depot/projects/soc2009/trasz_limits/lib/libedit/edit/readline/history.h#1 branch
.. //depot/projects/soc2009/trasz_limits/lib/libedit/edit/readline/readline.h#1 branch
.. //depot/projects/soc2009/trasz_limits/lib/libedit/histedit.h#1 branch
.. //depot/projects/soc2009/trasz_limits/lib/libedit/read.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libedit/readline.c#1 branch
.. //depot/projects/soc2009/trasz_limits/sbin/gvinum/Makefile#3 integrate
.. //depot/projects/soc2009/trasz_limits/sbin/gvinum/gvinum.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sbin/ifconfig/ifconfig.8#15 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/ARABIC%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/CELTIC%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/CENTEURO%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/CROATIAN%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/CYRILLIC%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/DEVANAGA%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/DINGBATS%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/FARSI%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/GAELIC%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/GREEK%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/GUJARATI%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/GURMUKHI%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/HEBREW%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/ICELAND%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/INUIT%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/KEYBOARD%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/ROMAN%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/ROMANIAN%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/SYMBOL%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/THAI%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/TURKISH%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25ARABIC.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25CELTIC.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25CENTEURO.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25CROATIAN.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25CYRILLIC.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25DEVANAGA.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25DINGBATS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25FARSI.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25GAELIC.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25GREEK.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25GUJARATI.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25GURMUKHI.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25HEBREW.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25ICELAND.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25INUIT.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25KEYBOARD.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25ROMAN.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25ROMANIAN.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25SYMBOL.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25THAI.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25TURKISH.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/AST/ARMSCII-7%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/AST/ARMSCII-8%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/AST/ARMSCII-8A%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/AST/UCS%25ARMSCII-7.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/AST/UCS%25ARMSCII-8.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/AST/UCS%25ARMSCII-8A.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/BIG5/Big5UDA%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/BIG5/UCS%25Big5UDA.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CNS/CNS11643-1%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CNS/CNS11643-2%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CNS/UCS%25CNS11643-1.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CNS/UCS%25CNS11643-2.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP037%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP038%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP10000%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP10006%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP10007%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP10029%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1006%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP10079%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP10081%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1026%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1046%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1124%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1125%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1129%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1131%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1133%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1161%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1162%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1163%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1250%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1251%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1252%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1253%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1254%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1255%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1256%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1257%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1258%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP273%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP274%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP275%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP277%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP278%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP280%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP281%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP284%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP285%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP290%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP297%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP420%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP423%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP424%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP437%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP500%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP737%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP775%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP850%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP851%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP852%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP853%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP855%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP856%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP857%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP858%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP860%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP861%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP862%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP863%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP864%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP865%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP866%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP868%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP869%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP870%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP871%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP874%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP875%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP880%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP891%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP903%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP904%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP905%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP918%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP922%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP932UDA%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP936EXT%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP942EXT%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP949EXT%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP950%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP037.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP038.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP10000.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP10006.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP10007.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP10029.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1006.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP10079.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP10081.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1026.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1046.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1124.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1125.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1129.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1131.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1133.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1161.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1162.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1163.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1250.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1251.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1252.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1253.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1254.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1255.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1256.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1257.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP1258.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP273.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP274.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP275.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP277.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP278.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP280.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP281.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP284.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP285.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP290.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP297.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP420.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP423.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP424.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP437.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP500.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP737.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP775.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP850.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP851.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP852.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP853.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP855.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP856.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP857.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP858.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP860.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP861.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP862.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP863.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP864.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP865.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP866.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP868.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP869.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP870.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP871.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP874.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP875.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP880.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP891.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP903.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP904.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP905.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP918.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP922.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP932UDA.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP936EXT.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP942EXT.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP949EXT.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/UCS%25CP950.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-AT-DE%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-AT-DE-A%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-CA-FR%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-DK-NO%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-DK-NO-A%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-ES%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-ES-A%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-ES-S%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-FI-SE%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-FI-SE-A%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-FR%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-IT%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-PT%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/EBCDIC-UK%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-AT-DE-A.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-AT-DE.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-CA-FR.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-DK-NO-A.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-DK-NO.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-ES-A.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-ES-S.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-ES.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-FI-SE-A.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-FI-SE.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-FR.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-IT.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-PT.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-UK.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/GB12345%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/GB2312%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/GB2312EXT%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/GB2312GBK%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/GB2312UDA1%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/GB2312UDA2%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/GBKEXT%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/GBKUDA%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/ISO-IR-165EXT%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/UCS%25GB12345.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/UCS%25GB2312.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/UCS%25GB2312EXT.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/UCS%25GB2312UDA1.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/UCS%25GB2312UDA2.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/UCS%25GBKEXT.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/UCS%25GBKUDA.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GB/UCS%25ISO-IR-165EXT.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GEORGIAN/GEORGIAN-ACADEMY%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GEORGIAN/GEORGIAN-PS%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GEORGIAN/UCS%25GEORGIAN-ACADEMY.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/GEORGIAN/UCS%25GEORGIAN-PS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-10%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-11%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-13%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-14%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-15%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-16%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-2%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-3%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-4%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-5%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-6%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-7%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-8%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/ISO-8859-9%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-10.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-11.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-13.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-14.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-15.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-16.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-2.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-3.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-4.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-5.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-6.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-7.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-8.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-9.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-CA%25UCS.646#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-CA2%25UCS.646#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-CN%25UCS.646#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-CU%25UCS.646#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-DE%25UCS.646#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-DK%25UCS.646#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-ES%25UCS.646#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-ES2%25UCS.646#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-FI%25UCS.646#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-FR%25UCS.646#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-FR1%25UCS.646#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-GB%25UCS.646#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-HU%25UCS.646#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-IT%25UCS.646#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-JP%25UCS.646#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-JP-OCR-B%25UCS.646#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-KR%25UCS.646#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-NO%25UCS.646#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-NO2%25UCS.646#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-PT%25UCS.646#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-PT2%25UCS.646#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-SE%25UCS.646#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-SE2%25UCS.646#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-US%25UCS.646#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/ISO646/ISO646-YU%25UCS.646#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/JIS/JISX0201-KANA%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/JIS/JISX0208UDC%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/JIS/JISX0212%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/JIS/JISX0212UDC%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/JIS/UCS%25JISX0201-KANA.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/JIS/UCS%25JISX0208UDC.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/JIS/UCS%25JISX0212.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/JIS/UCS%25JISX0212UDC.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KAZAKH/KZ1048%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KAZAKH/PTCP154%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KAZAKH/UCS%25KZ1048.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KAZAKH/UCS%25PTCP154.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/GOST19768-74%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/ISO-5427%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/KOI7%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/KOI8%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/KOI8-C%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/KOI8-CyrillicOld%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/KOI8-E%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/KOI8-R%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/KOI8-RU%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/KOI8-T%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/KOI8-U%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25GOST19768-74.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25ISO-5427.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25KOI7.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25KOI8-C.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25KOI8-CyrillicOld.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25KOI8-E.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25KOI8-R.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25KOI8-RU.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25KOI8-T.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25KOI8-U.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KOI/UCS%25KOI8.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KS/JOHAB%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KS/KSC5601HANGUL%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KS/KSC5601HANJA%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KS/UCS%25JOHAB.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KS/UCS%25KSC5601HANGUL.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/KS/UCS%25KSC5601HANJA.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/ATARIST%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/DECMCS%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/HP-ROMAN8%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/MULELAO-1%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/NEXTSTEP%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/RISCOS-LATIN1%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/TDS565%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/UCS%25ATARIST.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/UCS%25DECMCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/UCS%25HP-ROMAN8.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/UCS%25MULELAO-1.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/UCS%25NEXTSTEP.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/UCS%25RISCOS-LATIN1.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/MISC/UCS%25TDS565.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/TCVN/TCVN5712-1%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/TCVN/UCS%25TCVN5712-1.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/TCVN/UCS%25VISCII.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/TCVN/VISCII%25UCS.src#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man4/Makefile#31 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man4/ada.4#4 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man4/nvram2env.4#1 branch
.. //depot/projects/soc2009/trasz_limits/share/man/man5/src.conf.5#10 integrate
.. //depot/projects/soc2009/trasz_limits/share/mk/bsd.own.mk#13 integrate
.. //depot/projects/soc2009/trasz_limits/sys/boot/common/bootstrap.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/boot/common/load_elf.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/boot/common/load_elf_obj.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/boot/common/module.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/boot/i386/boot2/Makefile#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/boot/i386/boot2/boot2.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/boot/i386/boot2/lib.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/boot/i386/boot2/sio.S#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/boot/ia64/common/copy.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/boot/ia64/common/exec.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/boot/ia64/common/libia64.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/boot/ia64/efi/main.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/boot/ia64/ski/efi_stub.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/boot/ia64/ski/main.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/boot/pc98/boot2/Makefile#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/boot/pc98/loader/main.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cam/ata/ata_da.c#15 integrate
.. //depot/projects/soc2009/trasz_limits/sys/compat/linux/linux_misc.c#24 integrate
.. //depot/projects/soc2009/trasz_limits/sys/compat/svr4/imgact_svr4.c#13 integrate
.. //depot/projects/soc2009/trasz_limits/sys/conf/options.mips#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/ddb/db_command.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/acpica/acpi.c#21 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/acpica/acpi_timer.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/acpica/acpivar.h#14 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ahci/ahci.c#23 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/arcmsr/arcmsr.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/arcmsr/arcmsr.h#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ah_osdep.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ah.c#12 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ah.h#12 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ah_eeprom_v14.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ah_internal.h#12 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#12 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar5416/ar5416_recv.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/if_ath.c#28 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/if_athvar.h#11 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/bge/if_bge.c#26 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/bge/if_bgereg.h#11 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/bxe/if_bxe.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/bxe/if_bxe.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/cxgbe/t4_ioctl.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/cxgbe/t4_main.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/e1000/if_igb.c#29 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/e1000/if_igb.h#13 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/mxge/if_mxge.c#17 integrate
.. //depot/projects/soc2009/trasz_limits/sys/fs/fdescfs/fdesc_vfsops.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/i386/i386/machdep.c#28 integrate
.. //depot/projects/soc2009/trasz_limits/sys/i386/include/atomic.h#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/i386/include/cpu.h#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/i386/linux/imgact_linux.c#14 edit
.. //depot/projects/soc2009/trasz_limits/sys/ia64/include/bootinfo.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/imgact_aout.c#17 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/imgact_elf.c#27 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/imgact_gzip.c#12 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_clock.c#11 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_descrip.c#26 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_ktrace.c#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_racct.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_resource.c#65 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_sig.c#24 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/sched_4bsd.c#14 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/sysv_msg.c#14 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/sysv_sem.c#15 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/sysv_shm.c#16 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/vfs_subr.c#28 integrate
.. //depot/projects/soc2009/trasz_limits/sys/mips/atheros/if_arge.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/mips/atheros/if_argevar.h#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/modules/firewire/fwip/Makefile#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/net/if.c#30 integrate
.. //depot/projects/soc2009/trasz_limits/sys/pc98/pc98/machdep.c#22 integrate
.. //depot/projects/soc2009/trasz_limits/sys/sys/errno.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/sys/msg.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/sys/sem.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/sys/shm.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/ufs/ffs/ffs_alloc.c#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/ufs/ffs/ffs_extern.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/ufs/ffs/ffs_softdep.c#20 integrate
.. //depot/projects/soc2009/trasz_limits/sys/ufs/ffs/softdep.h#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/vm/swap_pager.c#23 integrate
.. //depot/projects/soc2009/trasz_limits/sys/vm/vm_glue.c#15 integrate
.. //depot/projects/soc2009/trasz_limits/sys/vm/vm_map.c#36 integrate
.. //depot/projects/soc2009/trasz_limits/sys/vm/vm_mmap.c#26 integrate
.. //depot/projects/soc2009/trasz_limits/sys/vm/vm_pageout.c#34 edit
.. //depot/projects/soc2009/trasz_limits/sys/vm/vm_unix.c#16 integrate
.. //depot/projects/soc2009/trasz_limits/tools/build/mk/OptionalObsoleteFiles.inc#14 integrate
.. //depot/projects/soc2009/trasz_limits/tools/build/options/WITHOUT_CXX#2 integrate
.. //depot/projects/soc2009/trasz_limits/tools/regression/lib/libc/string/test-strerror.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/tools/tools/ath/Makefile#4 integrate
.. //depot/projects/soc2009/trasz_limits/tools/tools/ath/arcode/Makefile#1 branch
.. //depot/projects/soc2009/trasz_limits/tools/tools/ath/arcode/arcode.c#1 branch
.. //depot/projects/soc2009/trasz_limits/usr.bin/limits/limits.1#3 integrate
.. //depot/projects/soc2009/trasz_limits/usr.sbin/Makefile#21 integrate
.. //depot/projects/soc2009/trasz_limits/usr.sbin/bsdinstall/bsdinstall#2 integrate
.. //depot/projects/soc2009/trasz_limits/usr.sbin/bsdinstall/scripts/wlanconfig#2 integrate
.. //depot/projects/soc2009/trasz_limits/usr.sbin/mfiutil/mfi_volume.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/usr.sbin/mfiutil/mfiutil.8#4 integrate
.. //depot/projects/soc2009/trasz_limits/usr.sbin/ntp/ntpdc/Makefile#2 integrate
.. //depot/projects/soc2009/trasz_limits/usr.sbin/ntp/ntpq/Makefile#2 integrate
.. //depot/projects/soc2009/trasz_limits/usr.sbin/usbdump/Makefile#2 integrate
.. //depot/projects/soc2009/trasz_limits/usr.sbin/usbdump/usbdump.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/usr.sbin/wpa/wpa_cli/Makefile#3 integrate

Differences ...

==== //depot/projects/soc2009/trasz_limits/Makefile.inc1#25 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.690 2011/04/01 20:59:23 uqs Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.692 2011/04/06 20:08:23 uqs Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -1019,11 +1019,11 @@
 _crunchgen=	usr.sbin/crunch/crunchgen
 .endif
 
-# XXX: There is no way to specify bootstrap tools depending on MK-flags
-# with different per-architecture default values. Always build tblgen.
+.if ${MK_CLANG} != "no"
 _clang_tblgen= \
 	lib/clang/libllvmsupport \
 	usr.bin/clang/tblgen
+.endif
 
 .if ${MK_CDDL} != "no"
 _dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf lib/libelf \
@@ -1127,10 +1127,12 @@
 .endif
 .endif
 
+.if ${MK_CLANG} != "no"
 .if ${CC:T:Mclang} == "clang"
 _clang=		usr.bin/clang
 _clang_libs=	lib/clang
 .endif
+.endif
 
 cross-tools:
 .for _tool in \

==== //depot/projects/soc2009/trasz_limits/etc/mtree/BSD.include.dist#12 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.142 2011/03/24 21:31:32 mav Exp $
+# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.143 2011/04/05 18:41:01 obrien Exp $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
@@ -137,6 +137,10 @@
         wi
         ..
     ..
+    edit
+        readline
+        ..
+    ..
     fs
         devfs
         ..

==== //depot/projects/soc2009/trasz_limits/include/Makefile#14 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 1/4/94
-# $FreeBSD: src/include/Makefile,v 1.303 2011/03/24 21:31:32 mav Exp $
+# $FreeBSD: src/include/Makefile,v 1.304 2011/04/05 18:41:01 obrien Exp $
 #
 # Doing a "make install" builds /usr/include.
 
@@ -11,7 +11,7 @@
 	db.h \
 	dirent.h dlfcn.h elf.h elf-hints.h err.h fmtmsg.h fnmatch.h fstab.h \
 	fts.h ftw.h getopt.h glob.h grp.h gssapi.h \
-	histedit.h ieeefp.h ifaddrs.h \
+	ieeefp.h ifaddrs.h \
 	inttypes.h iso646.h kenv.h langinfo.h libgen.h limits.h link.h \
 	locale.h malloc.h malloc_np.h memory.h monetary.h mpool.h mqueue.h \
 	ndbm.h netconfig.h \

==== //depot/projects/soc2009/trasz_limits/lib/libc/gen/errlst.c#4 (text+ko) ====

@@ -31,12 +31,12 @@
 static char sccsid[] = "@(#)errlst.c	8.2 (Berkeley) 11/16/93";
 #endif /* LIBC_SCCS and not lint */
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/gen/errlst.c,v 1.11 2011/03/03 11:28:57 rwatson Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/errlst.c,v 1.12 2011/04/05 21:56:05 jilles Exp $");
 
 #include 
 
 const char *const sys_errlist[] = {
-	"Undefined error: 0",			/*  0 - ENOERROR */
+	"No error: 0",				/*  0 - ENOERROR */
 	"Operation not permitted",		/*  1 - EPERM */
 	"No such file or directory",		/*  2 - ENOENT */
 	"No such process",			/*  3 - ESRCH */

==== //depot/projects/soc2009/trasz_limits/lib/libc/string/strerror.3#2 (text+ko) ====

@@ -30,9 +30,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strerror.3	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD: src/lib/libc/string/strerror.3,v 1.24 2007/01/09 00:28:12 imp Exp $
+.\" $FreeBSD: src/lib/libc/string/strerror.3,v 1.25 2011/04/05 21:56:05 jilles Exp $
 .\"
-.Dd October 12, 2004
+.Dd April 5, 2011
 .Dt STRERROR 3
 .Os
 .Sh NAME
@@ -114,6 +114,9 @@
 .Fa errnum
 <
 .Fa sys_nerr .
+The number 0 is also recognized, although applications that take advantage of
+this are likely to use unspecified values of
+.Va errno .
 .Pp
 If insufficient storage is provided in
 .Fa strerrbuf

==== //depot/projects/soc2009/trasz_limits/lib/libc/string/strerror.c#2 (text+ko) ====

@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)strerror.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/string/strerror.c,v 1.16 2007/01/09 00:28:12 imp Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/string/strerror.c,v 1.17 2011/04/05 21:56:05 jilles Exp $");
 
 #if defined(NLS)
 #include 
@@ -87,7 +87,7 @@
 	catd = catopen("libc", NL_CAT_LOCALE);
 #endif
 
-	if (errnum < 1 || errnum >= sys_nerr) {
+	if (errnum < 0 || errnum >= sys_nerr) {
 		errstr(errnum,
 #if defined(NLS)
 			catgets(catd, 1, 0xffff, UPREFIX),

==== //depot/projects/soc2009/trasz_limits/lib/libdevstat/devstat.c#2 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/lib/libdevstat/devstat.c,v 1.29 2005/10/04 22:00:35 stefanf Exp $");
+__FBSDID("$FreeBSD: src/lib/libdevstat/devstat.c,v 1.30 2011/04/04 09:25:27 pluknet Exp $");
 
 #include 
 #include 
@@ -1014,11 +1014,12 @@
 	 * Break the (comma delimited) input string out into separate strings.
 	 */
 	for (tempstr = tstr, num_args  = 0; 
-	     (*tempstr = strsep(&match_str, ",")) != NULL && (num_args < 5); 
-	     num_args++)
-		if (**tempstr != '\0')
+	     (*tempstr = strsep(&match_str, ",")) != NULL && (num_args < 5);)
+		if (**tempstr != '\0') {
+			num_args++;
 			if (++tempstr >= &tstr[5])
 				break;
+		}
 
 	/* The user gave us too many type arguments */
 	if (num_args > 3) {

==== //depot/projects/soc2009/trasz_limits/lib/libedit/Makefile#5 (text+ko) ====

@@ -1,6 +1,6 @@
 #	$NetBSD: Makefile,v 1.34 2005/05/28 12:02:53 lukem Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/libedit/Makefile,v 1.34 2010/06/13 17:04:42 jilles Exp $
+# $FreeBSD: src/lib/libedit/Makefile,v 1.35 2011/04/05 18:41:01 obrien Exp $
 
 LIB=	edit
 SHLIB_MAJOR=	7
@@ -26,18 +26,23 @@
 	editline.3 tok_line.3 editline.3 tok_str.3
 
 # For speed and debugging
-#SRCS=   ${OSRCS} tokenizer.c history.c
+#SRCS=   ${OSRCS}
 # For protection
-SRCS=	editline.c tokenizer.c history.c
+SRCS=	editline.c
+SRCS+=	tokenizer.c history.c readline.c
 SRCS+=	common.h emacs.h fcns.h help.h vi.h
 CLEANFILES+= common.h editline.c emacs.h fcns.c fcns.h help.c help.h vi.h
 
-CFLAGS+= -I. -I${.CURDIR}
+INCS=	histedit.h
+
+CFLAGS+= -I. -I${.CURDIR} -I${.CURDIR}/edit
 CFLAGS+= #-DDEBUG_TTY -DDEBUG_KEY -DDEBUG_READ -DDEBUG -DDEBUG_REFRESH
 CFLAGS+= #-DDEBUG_PASTE -DDEBUG_EDIT
 
 WARNS?=	1
 
+SUBDIR= edit/readline
+
 AHDR=	vi.h emacs.h common.h
 ASRC=	${.CURDIR}/vi.c ${.CURDIR}/emacs.c ${.CURDIR}/common.c
 

==== //depot/projects/soc2009/trasz_limits/lib/libedit/read.c#2 (text+ko) ====

@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)read.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint && not SCCSID */
 #include 
-__FBSDID("$FreeBSD: src/lib/libedit/read.c,v 1.13 2007/03/11 21:47:40 stefanf Exp $");
+__FBSDID("$FreeBSD: src/lib/libedit/read.c,v 1.14 2011/04/05 18:41:01 obrien Exp $");
 
 /*
  * read.c: Clean this junk up! This is horrible code.
@@ -211,7 +211,7 @@
  *	Push a macro
  */
 public void
-el_push(EditLine *el, char *str)
+el_push(EditLine *el, const char *str)
 {
 	c_macro_t *ma = &el->el_chared.c_macro;
 

==== //depot/projects/soc2009/trasz_limits/sbin/gvinum/Makefile#3 (text+ko) ====

@@ -1,14 +1,14 @@
-# $FreeBSD: src/sbin/gvinum/Makefile,v 1.5 2009/10/19 16:00:24 ru Exp $
+# $FreeBSD: src/sbin/gvinum/Makefile,v 1.6 2011/04/05 18:41:01 obrien Exp $
 
 PROG=	gvinum
 SRCS=	gvinum.c gvinum.h geom_vinum_share.c
 MAN=	gvinum.8
 
 WARNS?=	2
-CFLAGS+=	-I${.CURDIR}/../../sys
+CFLAGS=	-I${.CURDIR}/../../sys -I${DESTDIR}/${INCLUDEDIR}/edit
 
-DPADD=	${LIBREADLINE} ${LIBTERMCAP} ${LIBDEVSTAT} ${LIBKVM} ${LIBGEOM}
-LDADD=	-lreadline -ltermcap -ldevstat -lkvm -lgeom
+DPADD=	${LIBEDIT} ${LIBTERMCAP} ${LIBDEVSTAT} ${LIBKVM} ${LIBGEOM}
+LDADD=	-ledit -ltermcap -ldevstat -lkvm -lgeom
 
 .PATH: ${.CURDIR}/../../sys/geom/vinum
 

==== //depot/projects/soc2009/trasz_limits/sbin/gvinum/gvinum.c#5 (text+ko) ====

@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sbin/gvinum/gvinum.c,v 1.16 2010/11/22 20:10:48 brucec Exp $
+ * $FreeBSD: src/sbin/gvinum/gvinum.c,v 1.17 2011/04/05 18:41:01 obrien Exp $
  */
 
 #include 
@@ -50,6 +50,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 

==== //depot/projects/soc2009/trasz_limits/sbin/ifconfig/ifconfig.8#15 (text+ko) ====

@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)ifconfig.8	8.3 (Berkeley) 1/5/94
-.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.176 2011/03/21 15:17:02 gjb Exp $
+.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.177 2011/04/06 11:20:54 gjb Exp $
 .\"
 .Dd March 20, 2011
 .Dt IFCONFIG 8
@@ -2537,7 +2537,7 @@
 .Li gif1 :
 .Dl # ifconfig gif1 destroy
 .Pp
-Scan for wireless networks using
+Display available wireless networks using
 .Li wlan0 :
 .Dl # ifconfig wlan0 list scan
 .Sh DIAGNOSTICS

==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/ARABIC%25UCS.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/CELTIC%25UCS.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/CENTEURO%25UCS.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/CROATIAN%25UCS.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/CYRILLIC%25UCS.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/DEVANAGA%25UCS.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/DINGBATS%25UCS.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/FARSI%25UCS.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/GAELIC%25UCS.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/GREEK%25UCS.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/GUJARATI%25UCS.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/GURMUKHI%25UCS.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/HEBREW%25UCS.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/ICELAND%25UCS.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/INUIT%25UCS.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/KEYBOARD%25UCS.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/ROMAN%25UCS.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/ROMANIAN%25UCS.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/SYMBOL%25UCS.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/THAI%25UCS.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/TURKISH%25UCS.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25ARABIC.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25CELTIC.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25CENTEURO.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25CROATIAN.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25CYRILLIC.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25DEVANAGA.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25DINGBATS.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25FARSI.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25GAELIC.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25GREEK.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25GUJARATI.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25GURMUKHI.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25HEBREW.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25ICELAND.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25INUIT.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25KEYBOARD.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25ROMAN.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25ROMANIAN.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25SYMBOL.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25THAI.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/APPLE/UCS%25TURKISH.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/AST/ARMSCII-7%25UCS.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/AST/ARMSCII-8%25UCS.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/AST/ARMSCII-8A%25UCS.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/AST/UCS%25ARMSCII-7.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/AST/UCS%25ARMSCII-8.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/AST/UCS%25ARMSCII-8A.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/BIG5/Big5UDA%25UCS.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/BIG5/UCS%25Big5UDA.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CNS/CNS11643-1%25UCS.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CNS/CNS11643-2%25UCS.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CNS/UCS%25CNS11643-1.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CNS/UCS%25CNS11643-2.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP037%25UCS.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP038%25UCS.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP10000%25UCS.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP10006%25UCS.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP10007%25UCS.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP10029%25UCS.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1006%25UCS.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP10079%25UCS.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP10081%25UCS.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1026%25UCS.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1046%25UCS.src#9 (text+ko) ====


==== //depot/projects/soc2009/trasz_limits/share/i18n/csmapper/CP/CP1124%25UCS.src#9 (text+ko) ====



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

From owner-p4-projects@FreeBSD.ORG  Fri Apr  8 12:53:33 2011
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 08F051065672; Fri,  8 Apr 2011 12:53:33 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BFB07106566C
	for ; Fri,  8 Apr 2011 12:53:32 +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 94FF58FC1D
	for ; Fri,  8 Apr 2011 12:53:32 +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 p38CrWJS082671
	for ; Fri, 8 Apr 2011 12:53:32 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p38CrWKi082668
	for perforce@freebsd.org; Fri, 8 Apr 2011 12:53:32 GMT
	(envelope-from jhb@freebsd.org)
Date: Fri, 8 Apr 2011 12:53:32 GMT
Message-Id: <201104081253.p38CrWKi082668@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 191192 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, 08 Apr 2011 12:53:33 -0000

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

Change 191192 by jhb@jhb_jhbbsd on 2011/04/08 12:52:41

	Tidy.

Affected files ...

.. //depot/projects/pci/sys/modules/rman/rman.c#10 edit

Differences ...

==== //depot/projects/pci/sys/modules/rman/rman.c#10 (text+ko) ====

@@ -1,5 +1,5 @@
 /*-
- * Regression tests for rman_adjust_resource() and rman_release_resource().
+ * Various regression tests for the resource manager.
  */
 
 #include 

From owner-p4-projects@FreeBSD.ORG  Fri Apr  8 16:39:43 2011
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7A0421065674; Fri,  8 Apr 2011 16:39:43 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3C46B1065672
	for ; Fri,  8 Apr 2011 16:39:43 +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 29BB98FC08
	for ; Fri,  8 Apr 2011 16:39:43 +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 p38Gdhvr024344
	for ; Fri, 8 Apr 2011 16:39:43 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p38Gdg99024341
	for perforce@freebsd.org; Fri, 8 Apr 2011 16:39:42 GMT
	(envelope-from rene@FreeBSD.org)
Date: Fri, 8 Apr 2011 16:39:42 GMT
Message-Id: <201104081639.p38Gdg99024341@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 191201 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, 08 Apr 2011 16:39:43 -0000

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

Change 191201 by rene@rene_acer on 2011/04/08 16:39:25

	IFC

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/install/chapter.sgml#19 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#25 integrate
.. //depot/projects/docproj_nl/www/en/platforms/ia64/todo.xsl#3 integrate
.. //depot/projects/docproj_nl/www/en/projects/summerofcode.xsl#8 integrate

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/install/chapter.sgml#19 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
 
@@ -4606,7 +4606,7 @@
 	  
 
 	  You must download one of either
-	    the bootonly ISO image (if available),
+	    the bootonly ISO image,
 	    or the image of disc1.  Do not download
 	    both of them, since the disc1 image
 	    contains everything that the bootonly

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#25 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
 
@@ -3126,7 +3126,8 @@
       Reasons to Run a Name Server
 
       Name servers generally come in two forms: authoritative
-	name servers, and caching name servers.
+	name servers, and caching (also known as resolving)
+	name servers.
 
       An authoritative name server is needed when:
 
@@ -3290,8 +3291,9 @@
 // or cause huge amounts of useless Internet traffic.
 
 options {
-	// Relative to the chroot directory, if any
-	directory	"/etc/namedb";
+	// All file and path names are relative to the chroot directory,
+	// if any, and should be fully qualified.
+	directory	"/etc/namedb/working";
 	pid-file	"/var/run/named/pid";
 	dump-file	"/var/dump/named_dump.db";
 	statistics-file	"/var/stats/named.stats";
@@ -3372,7 +3374,7 @@
 // Also, make sure to enable it in /etc/rc.conf.
 
 // The traditional root hints mechanism. Use this, OR the slave zones below.
-zone "." { type hint; file "named.root"; };
+zone "." { type hint; file "/etc/namedb/named.root"; };
 
 /*	Slaving the following zones from the root name servers has some
 	significant advantages:
@@ -3388,11 +3390,16 @@
 
 	To use this mechanism, uncomment the entries below, and comment
 	the hint zone above.
+
+	As documented at http://dns.icann.org/services/axfr/ these zones:
+	"." (the root), ARPA, IN-ADDR.ARPA, IP6.ARPA, and ROOT-SERVERS.NET
+	are availble for AXFR from these servers on IPv4 and IPv6:
+	xfr.lax.dns.icann.org, xfr.cjr.dns.icann.org
 */
 /*
 zone "." {
 	type slave;
-	file "slave/root.slave";
+	file "/etc/namedb/slave/root.slave";
 	masters {
 		192.5.5.241;	// F.ROOT-SERVERS.NET.
 	};
@@ -3400,20 +3407,12 @@
 };
 zone "arpa" {
 	type slave;
-	file "slave/arpa.slave";
+	file "/etc/namedb/slave/arpa.slave";
 	masters {
 		192.5.5.241;	// F.ROOT-SERVERS.NET.
 	};
 	notify no;
 };
-zone "in-addr.arpa" {
-	type slave;
-	file "slave/in-addr.arpa.slave";
-	masters {
-		192.5.5.241;	// F.ROOT-SERVERS.NET.
-	};
-	notify no;
-};
 */
 
 /*	Serving the following zones locally will prevent any queries
@@ -3422,117 +3421,133 @@
 	1. Faster local resolution for your users
 	2. No spurious traffic will be sent from your network to the roots
 */
-// RFC 1912
-zone "localhost"	{ type master; file "master/localhost-forward.db"; };
-zone "127.in-addr.arpa" { type master; file "master/localhost-reverse.db"; };
-zone "255.in-addr.arpa"	{ type master; file "master/empty.db"; };
+// RFCs 1912 and 5735 (and BCP 32 for localhost)
+zone "localhost"	{ type master; file "/etc/namedb/master/localhost-forward.db"; };
+zone "127.in-addr.arpa"	{ type master; file "/etc/namedb/master/localhost-reverse.db"; };
+zone "255.in-addr.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 
 // RFC 1912-style zone for IPv6 localhost address
-zone "0.ip6.arpa"	{ type master; file "master/localhost-reverse.db"; };
+zone "0.ip6.arpa"	{ type master; file "/etc/namedb/master/localhost-reverse.db"; };
+
+// "This" Network (RFCs 1912 and 5735)
+zone "0.in-addr.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
+
+// Private Use Networks (RFCs 1918 and 5735)
+zone "10.in-addr.arpa"	   { type master; file "/etc/namedb/master/empty.db"; };
+zone "16.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "17.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "18.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "19.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "20.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "21.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "22.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "23.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "24.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "25.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "26.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "27.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "28.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "29.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "30.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "31.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "168.192.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+
+// Link-local/APIPA (RFCs 3927 and 5735)
+zone "254.169.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
 
-// "This" Network (RFCs 1912 and 3330)
-zone "0.in-addr.arpa"		{ type master; file "master/empty.db"; };
+// IETF protocol assignments (RFCs 5735 and 5736)
+zone "0.0.192.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
 
-// Private Use Networks (RFC 1918)
-zone "10.in-addr.arpa"		{ type master; file "master/empty.db"; };
-zone "16.172.in-addr.arpa"	{ type master; file "master/empty.db"; };
-zone "17.172.in-addr.arpa"	{ type master; file "master/empty.db"; };
-zone "18.172.in-addr.arpa"	{ type master; file "master/empty.db"; };
-zone "19.172.in-addr.arpa"	{ type master; file "master/empty.db"; };
-zone "20.172.in-addr.arpa"	{ type master; file "master/empty.db"; };
-zone "21.172.in-addr.arpa"	{ type master; file "master/empty.db"; };
-zone "22.172.in-addr.arpa"	{ type master; file "master/empty.db"; };
-zone "23.172.in-addr.arpa"	{ type master; file "master/empty.db"; };
-zone "24.172.in-addr.arpa"	{ type master; file "master/empty.db"; };
-zone "25.172.in-addr.arpa"	{ type master; file "master/empty.db"; };
-zone "26.172.in-addr.arpa"	{ type master; file "master/empty.db"; };
-zone "27.172.in-addr.arpa"	{ type master; file "master/empty.db"; };
-zone "28.172.in-addr.arpa"	{ type master; file "master/empty.db"; };
-zone "29.172.in-addr.arpa"	{ type master; file "master/empty.db"; };
-zone "30.172.in-addr.arpa"	{ type master; file "master/empty.db"; };
-zone "31.172.in-addr.arpa"	{ type master; file "master/empty.db"; };
-zone "168.192.in-addr.arpa"	{ type master; file "master/empty.db"; };
+// TEST-NET-[1-3] for Documentation (RFCs 5735 and 5737)
+zone "2.0.192.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "100.51.198.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "113.0.203.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
 
-// Link-local/APIPA (RFCs 3330 and 3927)
-zone "254.169.in-addr.arpa"	{ type master; file "master/empty.db"; };
+// IPv6 Range for Documentation (RFC 3849)
+zone "8.b.d.0.1.0.0.2.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; };
 
-// TEST-NET for Documentation (RFC 3330)
-zone "2.0.192.in-addr.arpa"	{ type master; file "master/empty.db"; };
+// Domain Names for Documentation and Testing (BCP 32)
+zone "test" { type master; file "/etc/namedb/master/empty.db"; };
+zone "example" { type master; file "/etc/namedb/master/empty.db"; };
+zone "invalid" { type master; file "/etc/namedb/master/empty.db"; };
+zone "example.com" { type master; file "/etc/namedb/master/empty.db"; };
+zone "example.net" { type master; file "/etc/namedb/master/empty.db"; };
+zone "example.org" { type master; file "/etc/namedb/master/empty.db"; };
 
-// Router Benchmark Testing (RFC 3330)
-zone "18.198.in-addr.arpa"	{ type master; file "master/empty.db"; };
-zone "19.198.in-addr.arpa"	{ type master; file "master/empty.db"; };
+// Router Benchmark Testing (RFCs 2544 and 5735)
+zone "18.198.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "19.198.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
 
-// IANA Reserved - Old Class E Space
-zone "240.in-addr.arpa"		{ type master; file "master/empty.db"; };
-zone "241.in-addr.arpa"		{ type master; file "master/empty.db"; };
-zone "242.in-addr.arpa"		{ type master; file "master/empty.db"; };
-zone "243.in-addr.arpa"		{ type master; file "master/empty.db"; };
-zone "244.in-addr.arpa"		{ type master; file "master/empty.db"; };
-zone "245.in-addr.arpa"		{ type master; file "master/empty.db"; };
-zone "246.in-addr.arpa"		{ type master; file "master/empty.db"; };
-zone "247.in-addr.arpa"		{ type master; file "master/empty.db"; };
-zone "248.in-addr.arpa"		{ type master; file "master/empty.db"; };
-zone "249.in-addr.arpa"		{ type master; file "master/empty.db"; };
-zone "250.in-addr.arpa"		{ type master; file "master/empty.db"; };
-zone "251.in-addr.arpa"		{ type master; file "master/empty.db"; };
-zone "252.in-addr.arpa"		{ type master; file "master/empty.db"; };
-zone "253.in-addr.arpa"		{ type master; file "master/empty.db"; };
-zone "254.in-addr.arpa"		{ type master; file "master/empty.db"; };
+// IANA Reserved - Old Class E Space (RFC 5735)
+zone "240.in-addr.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
+zone "241.in-addr.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
+zone "242.in-addr.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
+zone "243.in-addr.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
+zone "244.in-addr.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
+zone "245.in-addr.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
+zone "246.in-addr.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
+zone "247.in-addr.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
+zone "248.in-addr.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
+zone "249.in-addr.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
+zone "250.in-addr.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
+zone "251.in-addr.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
+zone "252.in-addr.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
+zone "253.in-addr.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
+zone "254.in-addr.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 
 // IPv6 Unassigned Addresses (RFC 4291)
-zone "1.ip6.arpa"		{ type master; file "master/empty.db"; };
-zone "3.ip6.arpa"		{ type master; file "master/empty.db"; };
-zone "4.ip6.arpa"		{ type master; file "master/empty.db"; };
-zone "5.ip6.arpa"		{ type master; file "master/empty.db"; };
-zone "6.ip6.arpa"		{ type master; file "master/empty.db"; };
-zone "7.ip6.arpa"		{ type master; file "master/empty.db"; };
-zone "8.ip6.arpa"		{ type master; file "master/empty.db"; };
-zone "9.ip6.arpa"		{ type master; file "master/empty.db"; };
-zone "a.ip6.arpa"		{ type master; file "master/empty.db"; };
-zone "b.ip6.arpa"		{ type master; file "master/empty.db"; };
-zone "c.ip6.arpa"		{ type master; file "master/empty.db"; };
-zone "d.ip6.arpa"		{ type master; file "master/empty.db"; };
-zone "e.ip6.arpa"		{ type master; file "master/empty.db"; };
-zone "0.f.ip6.arpa"		{ type master; file "master/empty.db"; };
-zone "1.f.ip6.arpa"		{ type master; file "master/empty.db"; };
-zone "2.f.ip6.arpa"		{ type master; file "master/empty.db"; };
-zone "3.f.ip6.arpa"		{ type master; file "master/empty.db"; };
-zone "4.f.ip6.arpa"		{ type master; file "master/empty.db"; };
-zone "5.f.ip6.arpa"		{ type master; file "master/empty.db"; };
-zone "6.f.ip6.arpa"		{ type master; file "master/empty.db"; };
-zone "7.f.ip6.arpa"		{ type master; file "master/empty.db"; };
-zone "8.f.ip6.arpa"		{ type master; file "master/empty.db"; };
-zone "9.f.ip6.arpa"		{ type master; file "master/empty.db"; };
-zone "a.f.ip6.arpa"		{ type master; file "master/empty.db"; };
-zone "b.f.ip6.arpa"		{ type master; file "master/empty.db"; };
-zone "0.e.f.ip6.arpa"		{ type master; file "master/empty.db"; };
-zone "1.e.f.ip6.arpa"		{ type master; file "master/empty.db"; };
-zone "2.e.f.ip6.arpa"		{ type master; file "master/empty.db"; };
-zone "3.e.f.ip6.arpa"		{ type master; file "master/empty.db"; };
-zone "4.e.f.ip6.arpa"		{ type master; file "master/empty.db"; };
-zone "5.e.f.ip6.arpa"		{ type master; file "master/empty.db"; };
-zone "6.e.f.ip6.arpa"		{ type master; file "master/empty.db"; };
-zone "7.e.f.ip6.arpa"		{ type master; file "master/empty.db"; };
+zone "1.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
+zone "3.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
+zone "4.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
+zone "5.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
+zone "6.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
+zone "7.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
+zone "8.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
+zone "9.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
+zone "a.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
+zone "b.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
+zone "c.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
+zone "d.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
+zone "e.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
+zone "0.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
+zone "1.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
+zone "2.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
+zone "3.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
+zone "4.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
+zone "5.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
+zone "6.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
+zone "7.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
+zone "8.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
+zone "9.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
+zone "a.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
+zone "b.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
+zone "0.e.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
+zone "1.e.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
+zone "2.e.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
+zone "3.e.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
+zone "4.e.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
+zone "5.e.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
+zone "6.e.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
+zone "7.e.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 
 // IPv6 ULA (RFC 4193)
-zone "c.f.ip6.arpa"		{ type master; file "master/empty.db"; };
-zone "d.f.ip6.arpa"		{ type master; file "master/empty.db"; };
+zone "c.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
+zone "d.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 
 // IPv6 Link Local (RFC 4291)
-zone "8.e.f.ip6.arpa"		{ type master; file "master/empty.db"; };
-zone "9.e.f.ip6.arpa"		{ type master; file "master/empty.db"; };
-zone "a.e.f.ip6.arpa"		{ type master; file "master/empty.db"; };
-zone "b.e.f.ip6.arpa"		{ type master; file "master/empty.db"; };
+zone "8.e.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
+zone "9.e.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
+zone "a.e.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
+zone "b.e.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 
 // IPv6 Deprecated Site-Local Addresses (RFC 3879)
-zone "c.e.f.ip6.arpa"		{ type master; file "master/empty.db"; };
-zone "d.e.f.ip6.arpa"		{ type master; file "master/empty.db"; };
-zone "e.e.f.ip6.arpa"		{ type master; file "master/empty.db"; };
-zone "f.e.f.ip6.arpa"		{ type master; file "master/empty.db"; };
+zone "c.e.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
+zone "d.e.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
+zone "e.e.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
+zone "f.e.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
 
 // IP6.INT is Deprecated (RFC 4159)
-zone "ip6.int"			{ type master; file "master/empty.db"; };
+zone "ip6.int"		{ type master; file "/etc/namedb/master/empty.db"; };
 
 // NB: Do not use the IP addresses below, they are faked, and only
 // serve demonstration/documentation purposes!
@@ -3563,14 +3578,14 @@
 	allow-update {
 		key "exampleorgkey";
 	};
-	file "dynamic/example.org";
+	file "/etc/namedb/dynamic/example.org";
 };
 */
 
 /* Example of a slave reverse zone
 zone "1.168.192.in-addr.arpa" {
 	type slave;
-	file "slave/1.168.192.in-addr.arpa";
+	file "/etc/namedb/slave/1.168.192.in-addr.arpa";
 	masters {
 		192.168.1.1;
 	};
@@ -3908,13 +3923,13 @@
 
 	
 	  RFC1034
+	      url="http://tools.ietf.org/html/rfc1034">RFC1034
 	      - Domain Names - Concepts and Facilities
 	
 
 	
 	  RFC1035
+	      url="http://tools.ietf.org/html/rfc1035">RFC1035
 	      - Domain Names - Implementation and Specification
 	
       

==== //depot/projects/docproj_nl/www/en/platforms/ia64/todo.xsl#3 (text+ko) ====

@@ -9,7 +9,7 @@
 
   
 
-  
+  
 
   

==== //depot/projects/docproj_nl/www/en/projects/summerofcode.xsl#8 (text+ko) ====

@@ -7,7 +7,7 @@
  %developers;
 ]>
 
-
+
 
 
@@ -273,7 +273,7 @@
 
     
    
       
  • 18 March - Google to announce what open source
-	organizations will participate in Google Summer of Code 2010.
    • 
+	organizations will participate in Google Summer of Code 2011.
    
 
       
  • 28 March - Student application period opens.
 	
    • 

From owner-p4-projects@FreeBSD.ORG  Fri Apr  8 16:43:00 2011
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3F99A1065672; Fri,  8 Apr 2011 16:43:00 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 021EA106566C
	for ; Fri,  8 Apr 2011 16:43:00 +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 E564E8FC1B
	for ; Fri,  8 Apr 2011 16:42:59 +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 p38GgxqK025999
	for ; Fri, 8 Apr 2011 16:42:59 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p38GgxBc025996
	for perforce@freebsd.org; Fri, 8 Apr 2011 16:42:59 GMT
	(envelope-from rene@FreeBSD.org)
Date: Fri, 8 Apr 2011 16:42:59 GMT
Message-Id: <201104081642.p38GgxBc025996@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 191202 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, 08 Apr 2011 16:43:00 -0000

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

Change 191202 by rene@rene_acer on 2011/04/08 16:42:42

	developers-handbook: Remove lang/gpc as a Pascal compiler
	Submitted by:	Marco van de Voort [marcov stack.nl]
	MFP4 after:	lang/gpc is removed from the Ports Collection

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml#5 edit

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml#5 (text+ko) ====

@@ -325,10 +325,9 @@
 	experienced programmers; Pascal, on the other hand, was
 	designed as an educational language, and is quite a good
 	language to start with.  FreeBSD does not include Pascal
-	support in the base system, but both GNU Pascal Compiler (GPC)
-	and the Free Pascal Compiler
-	are available in the Ports Collection as
-	lang/gpc and
+	support in the base system, but
+	the Free Pascal Compiler is
+	available in the Ports Collection as
 	lang/fpc.
 
       As the edit-compile-run-debug cycle is rather tedious when