From owner-p4-projects@FreeBSD.ORG Sun Apr 25 19:35:20 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D2A41065675; Sun, 25 Apr 2010 19:35:20 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C5179106566C for ; Sun, 25 Apr 2010 19:35:19 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B134C8FC14 for ; Sun, 25 Apr 2010 19:35:19 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3PJZJEf068309 for ; Sun, 25 Apr 2010 19:35:19 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3PJZJ63068307 for perforce@freebsd.org; Sun, 25 Apr 2010 19:35:19 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 25 Apr 2010 19:35:19 GMT Message-Id: <201004251935.o3PJZJ63068307@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177338 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, 25 Apr 2010 19:35:20 -0000 http://p4web.freebsd.org/@@177338?ac=10 Change 177338 by rene@rene_acer on 2010/04/25 19:34:36 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#43 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#35 integrate .. //depot/projects/docproj_nl/share/pgpkeys/anchie.key#1 branch .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#35 integrate .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#32 integrate .. //depot/projects/docproj_nl/share/pgpkeys/rstone.key#1 branch .. //depot/projects/docproj_nl/www/en/developers.sgml#34 integrate .. //depot/projects/docproj_nl/www/en/news/status/Makefile#9 integrate .. //depot/projects/docproj_nl/www/en/news/status/report-2010-01-2010-03.xml#2 integrate .. //depot/projects/docproj_nl/www/en/news/status/status.sgml#10 integrate .. //depot/projects/docproj_nl/www/share/sgml/news.xml#77 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#43 (text+ko) ==== @@ -1,4 +1,4 @@ - + aaron@FreeBSD.org"> @@ -58,6 +58,8 @@ amurai@FreeBSD.org"> +anchie@FreeBSD.org"> + anders@FreeBSD.org"> andre@FreeBSD.org"> @@ -910,6 +912,8 @@ raj@FreeBSD.org"> +randi@FreeBSD.org"> + rdivacky@FreeBSD.org"> rees@FreeBSD.org"> @@ -958,6 +962,8 @@ rsm@FreeBSD.org"> +rstone@FreeBSD.org"> + ru@FreeBSD.org"> rushani@FreeBSD.org"> ==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#35 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -656,6 +656,11 @@ &pgpkey.gabor; + + &a.anchie; + &pgpkey.anchie; + + &a.rik; &pgpkey.rik; @@ -1331,6 +1336,11 @@ &pgpkey.vs; + + &a.rstone; + &pgpkey.rstone; + + &a.xride; &pgpkey.xride; ==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#32 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -11,6 +11,7 @@ + @@ -262,6 +263,7 @@ + ==== //depot/projects/docproj_nl/www/en/developers.sgml#34 (text+ko) ==== @@ -6,7 +6,7 @@ us to update author names, or the representation of those names (such as adding email addresses), by just editing a single file. -$FreeBSD: www/en/developers.sgml,v 1.246 2010/04/11 17:19:14 sahil Exp $ +$FreeBSD: www/en/developers.sgml,v 1.249 2010/04/21 08:12:38 randi Exp $ --> @@ -32,6 +32,7 @@ + @@ -455,6 +456,7 @@ + @@ -479,6 +481,7 @@ + ==== //depot/projects/docproj_nl/www/en/news/status/Makefile#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: www/en/news/status/Makefile,v 1.49 2010/01/17 17:34:02 danger Exp $ +# $FreeBSD: www/en/news/status/Makefile,v 1.50 2010/04/22 15:44:53 danger Exp $ .if exists(../Makefile.conf) .include "../Makefile.conf" @@ -46,6 +46,7 @@ XMLDOCS+= report-2009-01-2009-03 XMLDOCS+= report-2009-04-2009-09 XMLDOCS+= report-2009-10-2009-12 +XMLDOCS+= report-2010-01-2010-03 XSLT.DEFAULT= report.xsl ==== //depot/projects/docproj_nl/www/en/news/status/report-2010-01-2010-03.xml#2 (text+ko) ==== @@ -1,7 +1,7 @@ - + January-March @@ -12,10 +12,20 @@
Introduction -

SUMMARY GOES HERE

+

This report covers &os; related projects between January and + March 2010. Being the first of the four reports planned for 2010 with + 46 entries, it shows a good progress of the &os; Project and proves + that our committers are keeping up with the latest trends in the OS + development. During this period, a new minor version of &os;, + 7.3-RELEASE, has been released, while the release process for + 8.1-RELEASE is soon to begin and is planned to be released later this + summer.

+ +

Thanks to all the reporters for their excellent work! We hope you + enjoy the reading.

-

Thanks to all the reporters for the excellent work! We hope you - enjoy reading.

+

Please note that the deadline for submissions covering the + period between April and June 2010 is July 15th, 2010.

@@ -107,7 +117,7 @@

The ALQ(9) implementation and KPI has been rototilled and modified (one more patch needs to be committed) to support variable length - messages. In addition, it can now be compiled and loaded as a kernel + messages. In addition, it can now be compiled and loaded as a kernel module.

With the ALQ changes in head, SIFTR can finally be imported.

@@ -151,7 +161,7 @@ laid the groundwork to allow different congestion aware transports to share congestion control algorithms. The import into the head branch is a big job and my time is limited, so progress will be slow and I - will nott have it done and ready to MFC by 8.1 as I had hoped. I will + will not have it done and ready to MFC by 8.1 as I had hoped. I will aim to have it in 8.2 though.

@@ -178,7 +188,7 @@ -

In February work was done to address resources leaks in the +

In February work was done to address resource leaks in the (virtual) network stack, especially on teardown.

During that time also multiple general run-time problems and leaks @@ -193,11 +203,11 @@ especially radix/routing table memory.
In addition epair(4) was enhanced and debugging was improved.

-

Work on this had been sponsored by ISPsystem.

+

This work was sponsored by ISPsystem.

- Merge the remainders of patches. + Merge the remaining patches. Work on a better teardown model and get to the point where we can free UMA zones without keeping pages for type stability and @@ -249,7 +259,7 @@ - Release Engineering Team Status Report + Release Engineering Team @@ -292,7 +302,7 @@ -

mfsBSD is a set of scripts that generates a bootable image (e.g. a +

mfsBSD is a set of scripts that generate a bootable image (e.g. an ISO file) that creates a working minimal installation of &os; that is completely loaded into memory (mfs).

@@ -320,7 +330,7 @@
- The &os; Foundation Status Report + The &os; Foundation @@ -354,7 +364,7 @@

We grew our board of directors by adding Erwin Lansing. This will expand our representation in Europe. Erwin brings ports knowledge and - expertise the the board.

+ expertise to the board.

We continued our work on infrastructure projects to beef up hardware for package-building, network-testing, etc.

@@ -389,9 +399,9 @@

'tbemd' stands for Target Big Endian Must Die. The current build systems requires that one define TARGET_BIG_ENDIAN for either big endian MIPS or big endian ARM processors. There are many problems - with this approach. The resulting system will nott create the proper - binaries without TARGET_BIG_ENDIAN defined. There is no way to know - what the endian is of the system you are running easily. There are + with this approach. The resulting system will not create the proper + binaries without TARGET_BIG_ENDIAN defined. There is no easy way to + know what the endian is of the system you are running. There are many issues with ports, since they do not use bsd make, so do not pick up the extra flags that are added if TARGET_BIG_ENDIAN is defined.

@@ -403,13 +413,13 @@ mips big endian and 64-bit mips little endian respectively. ARM will move to arm (little endian) and armeb (big endian), again following the standards set elsewhere. To facilitate a number of different - MACHINE_ARCHs all built form the same source, a new MACHINE_CPUARCH + MACHINE_ARCHs all built from the same source, a new MACHINE_CPUARCH is introduced and represents the sources needed to build CPU support for a given MACHINE_ARCH.

In addition, MACHINE_ARCH is overused in the build system today. Many of its uses are gratuitous and can be simplified. Many of its - uses d not scale well and need to be refactored into a system that + uses do not scale well and need to be refactored into a system that will scale well. A per MACHINE/MACHINE_ARCH/MACHINE_CPUARCH selection mechanism for makefile snippets will be introduced to move much of the current if spaghetti into more controlled lists.
@@ -445,9 +455,9 @@

Work is underway to allow the &os; build system to use out of tree - compilers and binary utitilies (loaders, linkers, etc), especially in + compilers and binary utililies (loaders, linkers, etc), especially in a cross compilation environment. While it is possible to swap out the - compiler with relative ease with a compatible compiler, swapping out + compiler with a compatible compiler relatively easily, swapping out the toolchain is more involved. In addition, when using an external compiler to build the system, certain parts of buildworld can be omitted.

@@ -623,8 +633,8 @@ -

The purpose of this project is to provide embedded &os; with - generic and flexible scheme supporting NAND Flash devices. The +

The purpose of this project is to provide embedded &os; with a + generic and flexible scheme to support NAND Flash devices. The framework provides a set of KOBJ interfaces inside the kernel, which allow for uniform and flexible management of the NAND devices:

@@ -638,25 +648,25 @@ erase, get status etc.)
  • NAND character device, which exports chip device as a standard - character devices and allows to read/write directly to a device, as + character device and allows to read/write directly to a device, as well as perform other specific operations by using ioctl.
  • GEOM NAND class for basic access through GEOM.
  • Part of the infrastructure is a full system simulator of - ONFI-compliant devices (NANDsim), with userland control application. - This allows for exercising the framework on platforms without real + ONFI-compliant devices (NANDsim), with a userland control application. + This allows for exercising of the framework on platforms without real NAND chips.

    Current state highlights:

      -
    • The framework is considered functional complete (including +
    • The framework is considered functionally complete (including NANDsim).
    • -
    • Back-end drivers for NAND Flash controllers (NFC), compliant - with the framework, are available for the following chips
    • +
    • Framework compliant back-end drivers are available for the + following NAND Flash controller (NFC) chips:
      • Freescale MPC8572 (PowerPC)
      • @@ -734,7 +744,7 @@ ongoing basis, verifying how src code updates may affect the ports tree, as well as providing QA runs for major ports updates. Of note -exp runs were done for; gabor's BSD licensed bc/dc in src/, mva's - OpenAL and SDL upgrades; brooks' removal of NGROUPS; ed's removal + OpenAL and SDL upgrades; brooks' removal of NGROUPS; ed's removal of libcompat and regexp.h; dinoex's jpeg update; a test run for m4 update; jilles' update for sh(1); johans' update for bison; and roam's curl update.

        @@ -752,7 +762,7 @@ Most ports PRs are assigned, we now need to focus on testing, committing and closing. - Major commits expected soon include the lastest Xorg, KDE4, and + Major commits expected soon include the latest Xorg, KDE4, and Gnome updates. @@ -783,17 +793,17 @@ for a prototype to get a kernel to compile and boot with only INET6 but no INET compiled in earlier this year.

        -

        The main focus on this work is, at the moment, to identify general +

        The current focus is to identify general architectural problems and dependencies we do have between these two address families as well as with the upper layer protocols. This will - allow us to discuss those problems at one point, seek solutions but - also to keep in mind that we do not only need to take care of being - able to compile out INET6 in the future.

        + at some point allow us to discuss the issues and seek solutions, + preparing for a future where we can remove either INET or INET6 from + the system.

        Once we will have a stable, in-tree way to compile out either - address family, optimizations wrt. to size, as well as user space + address family, optimizations wrt. size, as well as user space will need to be worked on. In addition to this, the work is believed - to help should we further head into the direction of network stack + to help should we further head in the direction of network stack modularization.

        @@ -857,7 +867,7 @@ - experimental NFS subsystem (NFSv4) + Experimental NFS subsystem (NFSv4) @@ -873,11 +883,11 @@

        Although the bare bones of the NFS Version 4 support was released - in &os;8.0, the integration has been progressing slowly and support - should be functional for &os;8.1 for RFC3530 (NFS Version 4.0).

        + in &os; 8.0, the integration has been progressing slowly and support + should be functional for &os; 8.1 for RFC3530 (NFS Version 4.0).

        -

        Post &os;8.1, I believe the focus will be on code cleanup and, - under a projects area of svn, some experimental work on agressive +

        Post &os; 8.1, I believe the focus will be on code cleanup and, + under a projects area of svn, some experimental work on aggressive whole file caching to client disk.

        @@ -916,21 +926,22 @@
        - Branch for the rewrite + Branch for + the rewrite -

        Based on the idea of Jeff Roberton, we reimplemented the path for +

        Based on the idea of Jeff Roberson, we reimplemented the path for read(2)/write(2) syscalls using page cache (in wide sense) to - eliminate the issues with recursive vnode and buffers locks + eliminate the issues with recursive vnode and buffer lock acquisitions. The usual reads and writes are no longer calls into - VOP_READ/VOP_WRITE, the operation is done by copying user buffers to - or from the pages of vnode. This fixes known deadlocks when reads or - writes are done over file-mmaped buffers.

        + VOP_READ/VOP_WRITE; the operation is done by copying user buffers to + or from the pages of the vnode. This fixes known deadlocks when reads + or writes are done over file-mmaped buffers.

        -

        The patch changes the performance characteristics of I/O, we +

        The patch changes the performance characteristics of I/O, and we observed both better and worse behaviour. If filesystem implements VOP_GETPAGES and VOP_PUTPAGES without referencing buffer cache, buffers are completely eliminated from the i/o path (not true for UFS @@ -965,7 +976,7 @@

        The alpha version of libunwind library port for &os; x86 and x86_64 is completed and imported into the official libunwind git repository. Libunwind is the library to perform dynamic unwinding of - the stacks, using dwarf call frame information. Library features + stacks, using dwarf call frame information. The library features remote unwinding using ptrace(2), very fast setjmp(3) implementation and more interesting features.

        @@ -1037,7 +1048,7 @@

        We have recently completed a massive revision of ipfw and - dummynet, and the result have been committed to HEAD and stable/8. + dummynet, and the result has been committed to HEAD and stable/8. The main features introduced with this work are:

          @@ -1101,8 +1112,8 @@
        • Yet another bug causing unaligned accesses in NFS server operation has been found and fixed in &os; 7 and 8. Unlike as announced in the last Status Report, no Erratum Notices regarding - these problems has been issued though at it quickly became obvious - that dealing with so many of them is impracticable, especially + these problems have been issued as it quickly became obvious + that dealing with so many of them is impractical, especially since the fixes unveiled secondary bugs.
        • Alexander Motin has fixed several bugs in netgraph(4) nodes in @@ -1111,15 +1122,15 @@
        • Peter Jeremy has contributed several fixes for the sparc64 FPU emulation code, which now passes a test suite built around - TestFloat. These fixes were incorporated into into &os; 6, 7 and 8 + TestFloat. These fixes were incorporated into &os; 6, 7 and 8 but unfortunately did not quite make it into 7.3-RELEASE but will be present in 8.1-RELEASE and 7.4-RELEASE.
        • Support for UltraSPARC-IV and -IV+ CPUs has been added and will - be present in 8.1-RELEASE and 7.4-RELEASE. Thus Sun Fire V890 are - now supported, due to lack of properly working test hardware not - with configurations consisting of a mix of US-IV and -IV+ CPUs, and - run stable. However, performance is not yet where it should be, + be present in 8.1-RELEASE and 7.4-RELEASE. Thus Sun Fire V890 is + now supported and stable, though due to the lack of properly working + test hardware, not with configurations consisting of a mix of US-IV + and -IV+ CPUs. However, performance is not yet where it should be, i.e. a buildworld on a 4x1.5GHz US-IV+ Sun Fire V890 takes nearly 3 hours while on a Sun Fire V440 with (theoretically) less powerful 4x1.5GHz US-IIIi CPUs it takes just over 1 hour. So far it is @@ -1127,10 +1138,10 @@ be a silicon bug of US-IV+ CPUs encountered and worked around while adding support for these.
        • -
        • Work on getting Sun Fire V1280 supported has been continued and - after a third firmware bug has been worked around and a driver for +
        • Work on getting Sun Fire V1280 supported has been continued. + A third firmware bug has been worked around and a driver for the BootBus controller, which provides console and time-of-day - services in these machines, has been written, it is now possible to + services in these machines, has been written. It is now possible to netboot Sun Fire V1280 into multi-user mode. Unfortunately, they do not run stable as processes may hang when transitioning to another CPU, likely due to what the OpenSolaris code refers to as Cheetah+ @@ -1195,9 +1206,9 @@ - Gábor + Gábor - Kövesdán + Kövesdán gabor@FreeBSD.org @@ -1205,9 +1216,9 @@ - Gábor + Gábor - Páli + Páli pgj@FreeBSD.org @@ -1375,21 +1386,21 @@ help. Thanks to the external contributions of Frank Boerner we were able to update a substantial amount of documents. This has resulted in a great reduction of our backlog. Subsequently, Benedict has - agreed to take Frank under mentorship for the german doc project. We + agreed to take Frank under mentorship for the German doc project. We are looking forward to his future contributions and thank him for his past efforts.

          -

          Johann was busy keeping the german website in sync with updates to +

          Johann was busy keeping the German website in sync with updates to FreeBSD.org. However, there are still parts of the website that remain untranslated. We are looking for more support in maintaining - the german website.

          + the German website.

          -

          &os; users with german language skills are always welcome to join +

          &os; users with German language skills are always welcome to join our efforts in translating the documentation and/or fixing bugs.

          - Translate more parts of the documentation and the german + Translate more parts of the documentation and the German website. Keep the current documentation up to date. @@ -1428,7 +1439,7 @@

          QAT has been running on a single server for about two years now and has proven very effective at catching problems with ports commits. Many of the problems it cannot catch are architecture or - branch related. By moving QAT to a vmware box capable of running + branch related. By moving QAT to a VMware box capable of running arbitrary versions of &os; on both amd64 and i386 this limitation will be removed.

          @@ -1619,7 +1630,7 @@ fixed.

          It is now possible for interested parties to be emailed a weekly, - customized, report along the lines of the the above. If you are + customized, report along the lines of the above. If you are interested in setting one up, contact linimon@FreeBSD.org.

          @@ -1637,7 +1648,7 @@ welcome to join us in #freebsd-bugbusters on EFnet. We are always looking for additional help, whether your interests lie in triaging incoming PRs, generating patches to resolve existing problems, or - simply helping with the database housekeeping (identifying dulicate + simply helping with the database housekeeping (identifying duplicate PRs, ones that have already been resolved, etc). This is a great way of getting more involved with &os;!

          @@ -1782,9 +1793,9 @@ well as some changes to OpenSSH as well as plugins for PAM, NSS and can support.

          -

          We have used several existing work and updated them to use new +

          We have used several existing works and updated them to use new OpenLDAP API, fixed several bugs and integrated them together. All - these work are under BSD or similar license and our new work would be + these works are under BSD or similar license and our new work would be under 2-clause BSD license. Currently, we support storing user identity, password and SSH public keys in LDAP tree.

          @@ -1842,7 +1853,7 @@ PowerPC 970 (G5), and Cell Broadband Engine. Current machine support is limited to Apple single and dual processor G5 systems, with future support planned for IBM Power Systems servers and the Sony - Playstation 3.

          + PlayStation 3.

          @@ -1950,7 +1961,7 @@

          Webcamd is a userland daemon that enables use of hundreds of different USB based Linux device drivers under the &os;-8/9 operating system. - Currently the focus has been on USB webcam and USB DVB-T/S/C devices. + Current focus has been on USB webcam and USB DVB-T/S/C devices. It is also possible to use the webcamd framework to make other Linux kernel USB devices work under the &os;-8/9 operating system, without violating the GPL license. The daemon currently depends on libc, @@ -2050,7 +2061,7 @@ and 8-STABLE. Ongoing work is undergoing to bring bug fixes and performance improvements from upstream svn -HEAD to approximately ZFS v15 in the near future, and a full upgrade of ZFS to version 24 - including the de-duplication functionality, etc. The de-dubplication + including the de-duplication functionality, etc. The de-duplication functionality is currently partly supported, which is demonstrated below:

          @@ -2144,9 +2155,9 @@ on. The C++ part got a big boost now being able to compile all C++ code in &os; and itself.

          -

          We saw some movemement on Mips and PowerPC. Mips got its driver +

          We saw some movment on Mips and PowerPC. Mips got its driver definitions from Oleksander Tymoshenko and Nathan Whitehorn did the - same for PowerPC and tested the kernel. Currently the PPC kernel + same for PowerPC and tested the kernel. Currently, the PPC kernel seems to boot but due to lack of va_arg implementation for PowerPC nothing is printed out. Nathan is working on that.

          @@ -2168,4 +2179,177 @@ Discussion on integrating LLVM/clang into &os;.
          + + + SUJ: Journaled Softupdates + + + + + Jeff + Roberson + + jeff@FreeBSD.org + + + + + + + + +

          The soft-updates journaling project is nearing completion and will + be available in head by the time this status report is released. + Backports to other releases are maintained in SVN. SUJ is + fully backwards compatible with non-journaled softupdates. Existing + systems will not be affected. Journaling may be enabled and disabled + by tunefs on unmounted filesystems. Journaling provides near-instant + filesystem recovery after crash at the expense of some runtime + performance and extra disk I/O.

          + +
          + + + PC-BSD PC-SysInstall Backend + + + + + Kris + Moore + + kmoore@FreeBSD.org + + + + + + + pc-sysinstall in Trac + + + +

          We are currently doing a lot of code cleanup in the new System + Installer backend for PC-BSD, pc-sysinstall, which can be used to + install regular &os; as well. Some new features have already been + implemented, such as:

          + +
            +
          • Improved ZFS support, raidz, mirroring, multiple mount-points + per-pool, etc.
          • +
          • Support for GPT/EFI on "Full" installations, allowing us to go + beyond the 2TB barrier.
          • +
          • MBR Slice/Partition manager.
          • +
          • geli passphrase support.
          • +
          + + + + We are mostly finished migrating to only using gpart instead of + fdisk, which gives us some new functionality for dealing with GPT/EFI + partitioning schemes. + +
          + + + TCP/UDP connection groups + + + + + Robert + Watson + + rwatson@FreeBSD.org + + + + &os; network mailing list + + freebsd-net@FreeBSD.org + + + + +

          This on-going project is to reduce tcbinfo/udbinfo lock and cache + line contention; this global lock protects access to connection lists, + and while it is a read-write lock, it is acquired for every in-bound + packet (briefly) to look up the connection. This project adds a new + connection group table, which assigns connections to groups, each of + which has CPU affinity and aligns with RSS-selected queues in high-end + 1gbps and most 10gbps implementations. The following tasks have been + completed:

          + +
            +
          • Teach libkvm to handle dynamic per-cpu storage (DPCPU) to improve + crashdump analysis of per-CPU data.
          • +
          • Teach netstat to monitor netisr DPCPU queues for live kernels and + crashdumps.
          • +
          • Create a new inpcbgroup abstraction, used for UDP and TCP.
          • +
          • Distribute UDP and TCP connections (inpcbs) over groups based on + 4-tuple bindings.
          • +
          • Replicate membership across all groups for wildcard socket + bindings.
          • +
          • Write new TCP/UDP connection and binding regression tests.
          • +
          + +

          The following tasks remain:

          + +
            +
          • Migrate from naive work assignment algorithm to RSS + assignment.
          • +
          • Modify device driver KPI to allow consistent initialization and + configuration between stack and hardware.
          • +
          • Complete migration to dynamic, per-CPU network statistics in TCP, + UDP, and IP.
          • +
          • Add socket options to query effective CPU affinity of connections + from userspace.
          • +
          • On supporting hardware, allow affinity for a specific connection + to be explicitly migrated using a socket option.
          • +
          • Detailed performance evaluation and optimization.
          • +
          + +

          This work is being performed in the &os; Perforce repository, and + is sponsored by Juniper Networks. Connection groups and related + features are slated for inclusion in &os; 9.0 (with possible + backports to 8-STABLE of some features).

          + +
          + + + BSDCan 2010 — The BSD Conference + + + + + BSDCan Information + + info@BSDCan.org + + + + + + Tutorials and Talks Schedule + + + +

          BSDCan, a BSD conference held in Ottawa, Canada, has quickly + established itself as the technical conference for people + working on and with 4.4BSD based operating systems and related + projects. The organizers have found a fantastic formula that + appeals to a wide range of people from extreme novices to + advanced developers.

          + +

          BSDCan 2010 will be held on 13-14 May 2010 at the University of + Ottawa, and will be preceded by two days of Tutorials on 11-12 + May 2010.

          + +

          There will be related events (of a social nature, for the most + part) on the day before and after the conference.

          + +

          Please check the conference web site for more information.

          + +
          ==== //depot/projects/docproj_nl/www/en/news/status/status.sgml#10 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -8,7 +8,7 @@ &header; -

          Next submissions due: April 15th, 2010

          +

          Next submissions due: July 15th, 2010

          Use the xml generator or download and edit the @@ -39,6 +39,13 @@

          These status reports may be reproduced in whole or in part, as long as the source is clearly identified and appropriate credit given.

          +

          2010

          + +
          +

          2009

            ==== //depot/projects/docproj_nl/www/share/sgml/news.xml#77 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.310 2010/04/11 19:38:00 rene Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.315 2010/04/24 23:29:19 danger Exp $ @@ -36,6 +36,45 @@ 4 + 22 + + + January-March, 2010 Status Report + +

            The January-March, 2010 Status Report is now + available with 46 entries.

            +
            +
            + + + 20 + + +

            New committer: Randi Harper (src)

            +
            + +
            + + + 19 + + +

            New committer: Ryan Stone (src)

            +
            + +
            + + + 14 + + +

            New committer: Ana Kukec (src)

            +
            + +
            + + 11 @@ -284,7 +323,7 @@ October-December, 2009 Status Report

            The October-December, 2009 Status Report is now + href="&enbase;/news/status/report-2009-10-2009-12.html">now available with 38 entries.

            From owner-p4-projects@FreeBSD.ORG Sun Apr 25 21:21:06 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A9E5D1065678; Sun, 25 Apr 2010 21:21: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 471BE106566C for ; Sun, 25 Apr 2010 21:21:06 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 328F78FC0C for ; Sun, 25 Apr 2010 21:21:06 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3PLL6cV089542 for ; Sun, 25 Apr 2010 21:21:06 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3PLL6Vo089540 for perforce@freebsd.org; Sun, 25 Apr 2010 21:21:06 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 25 Apr 2010 21:21:06 GMT Message-Id: <201004252121.o3PLL6Vo089540@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177343 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, 25 Apr 2010 21:21:07 -0000 http://p4web.freebsd.org/@@177343?ac=10 Change 177343 by pgj@Binturong on 2010/04/25 21:20:23 IFC Affected files ... .. //depot/projects/docproj_hu/www/en/news/status/Makefile#9 integrate .. //depot/projects/docproj_hu/www/en/news/status/report-2010-01-2010-03.xml#2 integrate .. //depot/projects/docproj_hu/www/en/news/status/status.sgml#10 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#100 integrate .. //depot/projects/docproj_hu/www/share/sgml/news.xml#95 integrate Differences ... ==== //depot/projects/docproj_hu/www/en/news/status/Makefile#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: www/en/news/status/Makefile,v 1.49 2010/01/17 17:34:02 danger Exp $ +# $FreeBSD: www/en/news/status/Makefile,v 1.50 2010/04/22 15:44:53 danger Exp $ .if exists(../Makefile.conf) .include "../Makefile.conf" @@ -46,6 +46,7 @@ XMLDOCS+= report-2009-01-2009-03 XMLDOCS+= report-2009-04-2009-09 XMLDOCS+= report-2009-10-2009-12 +XMLDOCS+= report-2010-01-2010-03 XSLT.DEFAULT= report.xsl ==== //depot/projects/docproj_hu/www/en/news/status/report-2010-01-2010-03.xml#2 (text+ko) ==== @@ -1,7 +1,7 @@ - + January-March @@ -12,10 +12,20 @@
            Introduction -

            SUMMARY GOES HERE

            +

            This report covers &os; related projects between January and + March 2010. Being the first of the four reports planned for 2010 with + 46 entries, it shows a good progress of the &os; Project and proves + that our committers are keeping up with the latest trends in the OS + development. During this period, a new minor version of &os;, + 7.3-RELEASE, has been released, while the release process for + 8.1-RELEASE is soon to begin and is planned to be released later this + summer.

            + +

            Thanks to all the reporters for their excellent work! We hope you + enjoy the reading.

            -

            Thanks to all the reporters for the excellent work! We hope you - enjoy reading.

            +

            Please note that the deadline for submissions covering the + period between April and June 2010 is July 15th, 2010.

            @@ -107,7 +117,7 @@

            The ALQ(9) implementation and KPI has been rototilled and modified (one more patch needs to be committed) to support variable length - messages. In addition, it can now be compiled and loaded as a kernel + messages. In addition, it can now be compiled and loaded as a kernel module.

            With the ALQ changes in head, SIFTR can finally be imported.

            @@ -151,7 +161,7 @@ laid the groundwork to allow different congestion aware transports to share congestion control algorithms. The import into the head branch is a big job and my time is limited, so progress will be slow and I - will nott have it done and ready to MFC by 8.1 as I had hoped. I will + will not have it done and ready to MFC by 8.1 as I had hoped. I will aim to have it in 8.2 though.

            @@ -178,7 +188,7 @@ -

            In February work was done to address resources leaks in the +

            In February work was done to address resource leaks in the (virtual) network stack, especially on teardown.

            During that time also multiple general run-time problems and leaks @@ -193,11 +203,11 @@ especially radix/routing table memory.
            In addition epair(4) was enhanced and debugging was improved.

            -

            Work on this had been sponsored by ISPsystem.

            +

            This work was sponsored by ISPsystem.

            - Merge the remainders of patches. + Merge the remaining patches. Work on a better teardown model and get to the point where we can free UMA zones without keeping pages for type stability and @@ -249,7 +259,7 @@ - Release Engineering Team Status Report + Release Engineering Team @@ -292,7 +302,7 @@ -

            mfsBSD is a set of scripts that generates a bootable image (e.g. a +

            mfsBSD is a set of scripts that generate a bootable image (e.g. an ISO file) that creates a working minimal installation of &os; that is completely loaded into memory (mfs).

            @@ -320,7 +330,7 @@
            - The &os; Foundation Status Report + The &os; Foundation @@ -354,7 +364,7 @@

            We grew our board of directors by adding Erwin Lansing. This will expand our representation in Europe. Erwin brings ports knowledge and - expertise the the board.

            + expertise to the board.

            We continued our work on infrastructure projects to beef up hardware for package-building, network-testing, etc.

            @@ -389,9 +399,9 @@

            'tbemd' stands for Target Big Endian Must Die. The current build systems requires that one define TARGET_BIG_ENDIAN for either big endian MIPS or big endian ARM processors. There are many problems - with this approach. The resulting system will nott create the proper - binaries without TARGET_BIG_ENDIAN defined. There is no way to know - what the endian is of the system you are running easily. There are + with this approach. The resulting system will not create the proper + binaries without TARGET_BIG_ENDIAN defined. There is no easy way to + know what the endian is of the system you are running. There are many issues with ports, since they do not use bsd make, so do not pick up the extra flags that are added if TARGET_BIG_ENDIAN is defined.

            @@ -403,13 +413,13 @@ mips big endian and 64-bit mips little endian respectively. ARM will move to arm (little endian) and armeb (big endian), again following the standards set elsewhere. To facilitate a number of different - MACHINE_ARCHs all built form the same source, a new MACHINE_CPUARCH + MACHINE_ARCHs all built from the same source, a new MACHINE_CPUARCH is introduced and represents the sources needed to build CPU support for a given MACHINE_ARCH.

            In addition, MACHINE_ARCH is overused in the build system today. Many of its uses are gratuitous and can be simplified. Many of its - uses d not scale well and need to be refactored into a system that + uses do not scale well and need to be refactored into a system that will scale well. A per MACHINE/MACHINE_ARCH/MACHINE_CPUARCH selection mechanism for makefile snippets will be introduced to move much of the current if spaghetti into more controlled lists.
            @@ -445,9 +455,9 @@

            Work is underway to allow the &os; build system to use out of tree - compilers and binary utitilies (loaders, linkers, etc), especially in + compilers and binary utililies (loaders, linkers, etc), especially in a cross compilation environment. While it is possible to swap out the - compiler with relative ease with a compatible compiler, swapping out + compiler with a compatible compiler relatively easily, swapping out the toolchain is more involved. In addition, when using an external compiler to build the system, certain parts of buildworld can be omitted.

            @@ -623,8 +633,8 @@ -

            The purpose of this project is to provide embedded &os; with - generic and flexible scheme supporting NAND Flash devices. The +

            The purpose of this project is to provide embedded &os; with a + generic and flexible scheme to support NAND Flash devices. The framework provides a set of KOBJ interfaces inside the kernel, which allow for uniform and flexible management of the NAND devices:

            @@ -638,25 +648,25 @@ erase, get status etc.)
          • NAND character device, which exports chip device as a standard - character devices and allows to read/write directly to a device, as + character device and allows to read/write directly to a device, as well as perform other specific operations by using ioctl.
          • GEOM NAND class for basic access through GEOM.

          Part of the infrastructure is a full system simulator of - ONFI-compliant devices (NANDsim), with userland control application. - This allows for exercising the framework on platforms without real + ONFI-compliant devices (NANDsim), with a userland control application. + This allows for exercising of the framework on platforms without real NAND chips.

          Current state highlights:

            -
          • The framework is considered functional complete (including +
          • The framework is considered functionally complete (including NANDsim).
          • -
          • Back-end drivers for NAND Flash controllers (NFC), compliant - with the framework, are available for the following chips
          • +
          • Framework compliant back-end drivers are available for the + following NAND Flash controller (NFC) chips:
            • Freescale MPC8572 (PowerPC)
            • @@ -734,7 +744,7 @@ ongoing basis, verifying how src code updates may affect the ports tree, as well as providing QA runs for major ports updates. Of note -exp runs were done for; gabor's BSD licensed bc/dc in src/, mva's - OpenAL and SDL upgrades; brooks' removal of NGROUPS; ed's removal + OpenAL and SDL upgrades; brooks' removal of NGROUPS; ed's removal of libcompat and regexp.h; dinoex's jpeg update; a test run for m4 update; jilles' update for sh(1); johans' update for bison; and roam's curl update.

              @@ -752,7 +762,7 @@ Most ports PRs are assigned, we now need to focus on testing, committing and closing. - Major commits expected soon include the lastest Xorg, KDE4, and + Major commits expected soon include the latest Xorg, KDE4, and Gnome updates. @@ -783,17 +793,17 @@ for a prototype to get a kernel to compile and boot with only INET6 but no INET compiled in earlier this year.

              -

              The main focus on this work is, at the moment, to identify general +

              The current focus is to identify general architectural problems and dependencies we do have between these two address families as well as with the upper layer protocols. This will - allow us to discuss those problems at one point, seek solutions but - also to keep in mind that we do not only need to take care of being - able to compile out INET6 in the future.

              + at some point allow us to discuss the issues and seek solutions, + preparing for a future where we can remove either INET or INET6 from + the system.

              Once we will have a stable, in-tree way to compile out either - address family, optimizations wrt. to size, as well as user space + address family, optimizations wrt. size, as well as user space will need to be worked on. In addition to this, the work is believed - to help should we further head into the direction of network stack + to help should we further head in the direction of network stack modularization.

              @@ -857,7 +867,7 @@ - experimental NFS subsystem (NFSv4) + Experimental NFS subsystem (NFSv4) @@ -873,11 +883,11 @@

              Although the bare bones of the NFS Version 4 support was released - in &os;8.0, the integration has been progressing slowly and support - should be functional for &os;8.1 for RFC3530 (NFS Version 4.0).

              + in &os; 8.0, the integration has been progressing slowly and support + should be functional for &os; 8.1 for RFC3530 (NFS Version 4.0).

              -

              Post &os;8.1, I believe the focus will be on code cleanup and, - under a projects area of svn, some experimental work on agressive +

              Post &os; 8.1, I believe the focus will be on code cleanup and, + under a projects area of svn, some experimental work on aggressive whole file caching to client disk.

              @@ -916,21 +926,22 @@
              - Branch for the rewrite + Branch for + the rewrite -

              Based on the idea of Jeff Roberton, we reimplemented the path for +

              Based on the idea of Jeff Roberson, we reimplemented the path for read(2)/write(2) syscalls using page cache (in wide sense) to - eliminate the issues with recursive vnode and buffers locks + eliminate the issues with recursive vnode and buffer lock acquisitions. The usual reads and writes are no longer calls into - VOP_READ/VOP_WRITE, the operation is done by copying user buffers to - or from the pages of vnode. This fixes known deadlocks when reads or - writes are done over file-mmaped buffers.

              + VOP_READ/VOP_WRITE; the operation is done by copying user buffers to + or from the pages of the vnode. This fixes known deadlocks when reads + or writes are done over file-mmaped buffers.

              -

              The patch changes the performance characteristics of I/O, we +

              The patch changes the performance characteristics of I/O, and we observed both better and worse behaviour. If filesystem implements VOP_GETPAGES and VOP_PUTPAGES without referencing buffer cache, buffers are completely eliminated from the i/o path (not true for UFS @@ -965,7 +976,7 @@

              The alpha version of libunwind library port for &os; x86 and x86_64 is completed and imported into the official libunwind git repository. Libunwind is the library to perform dynamic unwinding of - the stacks, using dwarf call frame information. Library features + stacks, using dwarf call frame information. The library features remote unwinding using ptrace(2), very fast setjmp(3) implementation and more interesting features.

              @@ -1037,7 +1048,7 @@

              We have recently completed a massive revision of ipfw and - dummynet, and the result have been committed to HEAD and stable/8. + dummynet, and the result has been committed to HEAD and stable/8. The main features introduced with this work are:

                @@ -1101,8 +1112,8 @@
              • Yet another bug causing unaligned accesses in NFS server operation has been found and fixed in &os; 7 and 8. Unlike as announced in the last Status Report, no Erratum Notices regarding - these problems has been issued though at it quickly became obvious - that dealing with so many of them is impracticable, especially + these problems have been issued as it quickly became obvious + that dealing with so many of them is impractical, especially since the fixes unveiled secondary bugs.
              • Alexander Motin has fixed several bugs in netgraph(4) nodes in @@ -1111,15 +1122,15 @@
              • Peter Jeremy has contributed several fixes for the sparc64 FPU emulation code, which now passes a test suite built around - TestFloat. These fixes were incorporated into into &os; 6, 7 and 8 + TestFloat. These fixes were incorporated into &os; 6, 7 and 8 but unfortunately did not quite make it into 7.3-RELEASE but will be present in 8.1-RELEASE and 7.4-RELEASE.
              • Support for UltraSPARC-IV and -IV+ CPUs has been added and will - be present in 8.1-RELEASE and 7.4-RELEASE. Thus Sun Fire V890 are - now supported, due to lack of properly working test hardware not - with configurations consisting of a mix of US-IV and -IV+ CPUs, and - run stable. However, performance is not yet where it should be, + be present in 8.1-RELEASE and 7.4-RELEASE. Thus Sun Fire V890 is + now supported and stable, though due to the lack of properly working + test hardware, not with configurations consisting of a mix of US-IV + and -IV+ CPUs. However, performance is not yet where it should be, i.e. a buildworld on a 4x1.5GHz US-IV+ Sun Fire V890 takes nearly 3 hours while on a Sun Fire V440 with (theoretically) less powerful 4x1.5GHz US-IIIi CPUs it takes just over 1 hour. So far it is @@ -1127,10 +1138,10 @@ be a silicon bug of US-IV+ CPUs encountered and worked around while adding support for these.
              • -
              • Work on getting Sun Fire V1280 supported has been continued and - after a third firmware bug has been worked around and a driver for +
              • Work on getting Sun Fire V1280 supported has been continued. + A third firmware bug has been worked around and a driver for the BootBus controller, which provides console and time-of-day - services in these machines, has been written, it is now possible to + services in these machines, has been written. It is now possible to netboot Sun Fire V1280 into multi-user mode. Unfortunately, they do not run stable as processes may hang when transitioning to another CPU, likely due to what the OpenSolaris code refers to as Cheetah+ @@ -1195,9 +1206,9 @@ - Gábor + Gábor - Kövesdán + Kövesdán gabor@FreeBSD.org @@ -1205,9 +1216,9 @@ - Gábor + Gábor - Páli + Páli pgj@FreeBSD.org @@ -1375,21 +1386,21 @@ help. Thanks to the external contributions of Frank Boerner we were able to update a substantial amount of documents. This has resulted in a great reduction of our backlog. Subsequently, Benedict has - agreed to take Frank under mentorship for the german doc project. We + agreed to take Frank under mentorship for the German doc project. We are looking forward to his future contributions and thank him for his past efforts.

                -

                Johann was busy keeping the german website in sync with updates to +

                Johann was busy keeping the German website in sync with updates to FreeBSD.org. However, there are still parts of the website that remain untranslated. We are looking for more support in maintaining - the german website.

                + the German website.

                -

                &os; users with german language skills are always welcome to join +

                &os; users with German language skills are always welcome to join our efforts in translating the documentation and/or fixing bugs.

                - Translate more parts of the documentation and the german + Translate more parts of the documentation and the German website. Keep the current documentation up to date. @@ -1428,7 +1439,7 @@

                QAT has been running on a single server for about two years now and has proven very effective at catching problems with ports commits. Many of the problems it cannot catch are architecture or - branch related. By moving QAT to a vmware box capable of running + branch related. By moving QAT to a VMware box capable of running arbitrary versions of &os; on both amd64 and i386 this limitation will be removed.

                @@ -1619,7 +1630,7 @@ fixed.

                It is now possible for interested parties to be emailed a weekly, - customized, report along the lines of the the above. If you are + customized, report along the lines of the above. If you are interested in setting one up, contact linimon@FreeBSD.org.

                @@ -1637,7 +1648,7 @@ welcome to join us in #freebsd-bugbusters on EFnet. We are always looking for additional help, whether your interests lie in triaging incoming PRs, generating patches to resolve existing problems, or - simply helping with the database housekeeping (identifying dulicate + simply helping with the database housekeeping (identifying duplicate PRs, ones that have already been resolved, etc). This is a great way of getting more involved with &os;!

                @@ -1782,9 +1793,9 @@ well as some changes to OpenSSH as well as plugins for PAM, NSS and can support.

                -

                We have used several existing work and updated them to use new +

                We have used several existing works and updated them to use new OpenLDAP API, fixed several bugs and integrated them together. All - these work are under BSD or similar license and our new work would be + these works are under BSD or similar license and our new work would be under 2-clause BSD license. Currently, we support storing user identity, password and SSH public keys in LDAP tree.

                @@ -1842,7 +1853,7 @@ PowerPC 970 (G5), and Cell Broadband Engine. Current machine support is limited to Apple single and dual processor G5 systems, with future support planned for IBM Power Systems servers and the Sony - Playstation 3.

                + PlayStation 3.

                @@ -1950,7 +1961,7 @@

                Webcamd is a userland daemon that enables use of hundreds of different USB based Linux device drivers under the &os;-8/9 operating system. - Currently the focus has been on USB webcam and USB DVB-T/S/C devices. + Current focus has been on USB webcam and USB DVB-T/S/C devices. It is also possible to use the webcamd framework to make other Linux kernel USB devices work under the &os;-8/9 operating system, without violating the GPL license. The daemon currently depends on libc, @@ -2050,7 +2061,7 @@ and 8-STABLE. Ongoing work is undergoing to bring bug fixes and performance improvements from upstream svn -HEAD to approximately ZFS v15 in the near future, and a full upgrade of ZFS to version 24 - including the de-duplication functionality, etc. The de-dubplication + including the de-duplication functionality, etc. The de-duplication functionality is currently partly supported, which is demonstrated below:

                @@ -2144,9 +2155,9 @@ on. The C++ part got a big boost now being able to compile all C++ code in &os; and itself.

                -

                We saw some movemement on Mips and PowerPC. Mips got its driver +

                We saw some movment on Mips and PowerPC. Mips got its driver definitions from Oleksander Tymoshenko and Nathan Whitehorn did the - same for PowerPC and tested the kernel. Currently the PPC kernel + same for PowerPC and tested the kernel. Currently, the PPC kernel seems to boot but due to lack of va_arg implementation for PowerPC nothing is printed out. Nathan is working on that.

                @@ -2168,4 +2179,177 @@ Discussion on integrating LLVM/clang into &os;.
                + + + SUJ: Journaled Softupdates + + + + + Jeff + Roberson + + jeff@FreeBSD.org + + + + + + + + +

                The soft-updates journaling project is nearing completion and will + be available in head by the time this status report is released. + Backports to other releases are maintained in SVN. SUJ is + fully backwards compatible with non-journaled softupdates. Existing + systems will not be affected. Journaling may be enabled and disabled + by tunefs on unmounted filesystems. Journaling provides near-instant + filesystem recovery after crash at the expense of some runtime + performance and extra disk I/O.

                + +
                + + + PC-BSD PC-SysInstall Backend + + + + + Kris + Moore + + kmoore@FreeBSD.org + + + + + + + pc-sysinstall in Trac + + + +

                We are currently doing a lot of code cleanup in the new System + Installer backend for PC-BSD, pc-sysinstall, which can be used to + install regular &os; as well. Some new features have already been + implemented, such as:

                + +
                  +
                • Improved ZFS support, raidz, mirroring, multiple mount-points + per-pool, etc.
                • +
                • Support for GPT/EFI on "Full" installations, allowing us to go + beyond the 2TB barrier.
                • +
                • MBR Slice/Partition manager.
                • +
                • geli passphrase support.
                • +
                + + + + We are mostly finished migrating to only using gpart instead of + fdisk, which gives us some new functionality for dealing with GPT/EFI + partitioning schemes. + +
                + + + TCP/UDP connection groups + + + + + Robert + Watson + + rwatson@FreeBSD.org + + + + &os; network mailing list + + freebsd-net@FreeBSD.org + + + + +

                This on-going project is to reduce tcbinfo/udbinfo lock and cache + line contention; this global lock protects access to connection lists, + and while it is a read-write lock, it is acquired for every in-bound + packet (briefly) to look up the connection. This project adds a new + connection group table, which assigns connections to groups, each of + which has CPU affinity and aligns with RSS-selected queues in high-end + 1gbps and most 10gbps implementations. The following tasks have been + completed:

                + +
                  +
                • Teach libkvm to handle dynamic per-cpu storage (DPCPU) to improve + crashdump analysis of per-CPU data.
                • +
                • Teach netstat to monitor netisr DPCPU queues for live kernels and + crashdumps.
                • +
                • Create a new inpcbgroup abstraction, used for UDP and TCP.
                • +
                • Distribute UDP and TCP connections (inpcbs) over groups based on + 4-tuple bindings.
                • +
                • Replicate membership across all groups for wildcard socket + bindings.
                • +
                • Write new TCP/UDP connection and binding regression tests.
                • +
                + +

                The following tasks remain:

                + +
                  +
                • Migrate from naive work assignment algorithm to RSS + assignment.
                • +
                • Modify device driver KPI to allow consistent initialization and + configuration between stack and hardware.
                • +
                • Complete migration to dynamic, per-CPU network statistics in TCP, + UDP, and IP.
                • +
                • Add socket options to query effective CPU affinity of connections + from userspace.
                • +
                • On supporting hardware, allow affinity for a specific connection + to be explicitly migrated using a socket option.
                • +
                • Detailed performance evaluation and optimization.
                • +
                + +

                This work is being performed in the &os; Perforce repository, and + is sponsored by Juniper Networks. Connection groups and related + features are slated for inclusion in &os; 9.0 (with possible + backports to 8-STABLE of some features).

                + +
                + + + BSDCan 2010 — The BSD Conference + + + + + BSDCan Information + + info@BSDCan.org + + + + + + Tutorials and Talks Schedule + + + +

                BSDCan, a BSD conference held in Ottawa, Canada, has quickly + established itself as the technical conference for people + working on and with 4.4BSD based operating systems and related + projects. The organizers have found a fantastic formula that + appeals to a wide range of people from extreme novices to + advanced developers.

                + +

                BSDCan 2010 will be held on 13-14 May 2010 at the University of + Ottawa, and will be preceded by two days of Tutorials on 11-12 + May 2010.

                + +

                There will be related events (of a social nature, for the most + part) on the day before and after the conference.

                + +

                Please check the conference web site for more information.

                + +
                ==== //depot/projects/docproj_hu/www/en/news/status/status.sgml#10 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -8,7 +8,7 @@ &header; -

                Next submissions due: April 15th, 2010

                +

                Next submissions due: July 15th, 2010

                Use the xml generator or download and edit the @@ -39,6 +39,13 @@

                These status reports may be reproduced in whole or in part, as long as the source is clearly identified and appropriate credit given.

                +

                2010

                + +
                +

                2009

                  ==== //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#100 (text+ko) ==== @@ -5,13 +5,13 @@ - $FreeBSD: www/hu/share/sgml/news.xml,v 1.46 2010/04/15 11:22:51 pgj Exp $ + $FreeBSD: www/hu/share/sgml/news.xml,v 1.47 2010/04/21 20:09:58 pgj Exp $ @@ -22,6 +22,24 @@ 4 + 19 + + +

                  Új tag: Ryan + Stone (src)

                  +
                  +
                  + + + 14 + + +

                  Új tag: Ana + Kukec (src)

                  +
                  +
                  + + 11 ==== //depot/projects/docproj_hu/www/share/sgml/news.xml#95 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.313 2010/04/21 08:14:56 randi Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.315 2010/04/24 23:29:19 danger Exp $ @@ -36,6 +36,18 @@ 4 + 22 + + + January-March, 2010 Status Report + +

                  The January-March, 2010 Status Report is now + available with 46 entries.

                  +
                  +
                  + + 20 @@ -311,7 +323,7 @@ October-December, 2009 Status Report

                  The October-December, 2009 Status Report is now + href="&enbase;/news/status/report-2009-10-2009-12.html">now available with 38 entries.

                  From owner-p4-projects@FreeBSD.ORG Mon Apr 26 14:43:29 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 895AE10656DD; Mon, 26 Apr 2010 14:43: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 31D9810656C0 for ; Mon, 26 Apr 2010 14:43:29 +0000 (UTC) (envelope-from jona@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1FC828FC16 for ; Mon, 26 Apr 2010 14:43:29 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3QEhTk1032875 for ; Mon, 26 Apr 2010 14:43:29 GMT (envelope-from jona@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3QEhSL3032873 for perforce@freebsd.org; Mon, 26 Apr 2010 14:43:28 GMT (envelope-from jona@FreeBSD.org) Date: Mon, 26 Apr 2010 14:43:28 GMT Message-Id: <201004261443.o3QEhSL3032873@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jona@FreeBSD.org using -f From: Jonathan Anderson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177354 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, 26 Apr 2010 14:43:29 -0000 http://p4web.freebsd.org/@@177354?ac=10 Change 177354 by jona@jona-belle-freebsd8 on 2010/04/26 14:42:36 Allow objects to be loaded by FD number instead of name Affected files ... .. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/rtld.c#43 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/rtld.c#43 (text+ko) ==== @@ -1703,17 +1703,22 @@ return obj; #ifdef IN_RTLD_CAP - if (strchr(name, '/') != NULL) { - _rtld_error("Absolute paths to shared objects not supported \"%s\"", name); - return NULL; - } + path = xstrdup(name); /* is the name actually a file descriptor? */ - long long long_fd = strtonum(name, 0, 10000, NULL); - fd = (int) long_fd; - if (fstat(fd, &sb) == -1) { - /* if not, search the library path */ - path = xstrdup(name); + long long long_fd = strtonum(path, 0, __INT_MAX, NULL); + if ((long_fd >= 0) && (fstat((int) long_fd, &sb) == 0)) + fd = (int) long_fd; + + /* if not, search the library path */ + else { + dbg("preload by name: %s", name); + if (strchr(name, '/') != NULL) { + _rtld_error("Absolute paths (e.g. \"%s\") not supported", path); + free(path); + return NULL; + } + if ((fd = find_library_fd(path)) < 0) { _rtld_error("Unable to find \"%s\" in LD_LIBRARY_DIRS", path); free(path); @@ -1791,7 +1796,7 @@ if (dangerous_ld_env) { if (fstatfs(fd, &fs) != 0) { _rtld_error("Cannot fstatfs \"%s\"", path); - return NULL; + return NULL; } if (fs.f_flags & MNT_NOEXEC) { _rtld_error("Cannot execute objects on %s\n", fs.f_mntonname); From owner-p4-projects@FreeBSD.ORG Mon Apr 26 14:47:33 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BEBFC1065680; Mon, 26 Apr 2010 14:47: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 7C8B51065670 for ; Mon, 26 Apr 2010 14:47:33 +0000 (UTC) (envelope-from jona@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 518228FC14 for ; Mon, 26 Apr 2010 14:47:33 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3QElXda033170 for ; Mon, 26 Apr 2010 14:47:33 GMT (envelope-from jona@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3QElXLf033168 for perforce@freebsd.org; Mon, 26 Apr 2010 14:47:33 GMT (envelope-from jona@FreeBSD.org) Date: Mon, 26 Apr 2010 14:47:33 GMT Message-Id: <201004261447.o3QElXLf033168@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jona@FreeBSD.org using -f From: Jonathan Anderson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177355 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, 26 Apr 2010 14:47:34 -0000 http://p4web.freebsd.org/@@177355?ac=10 Change 177355 by jona@jona-belle-freebsd8 on 2010/04/26 14:46:57 Added lc_fdlist_print() Affected files ... .. //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum.h#14 edit .. //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_fdlist.c#12 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum.h#14 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum.h#13 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum.h#14 $ */ #ifndef _LIBCAPSICUM_H_ @@ -52,6 +52,7 @@ struct lc_fdlist *lc_fdlist_global(void); struct lc_fdlist *lc_fdlist_dup(struct lc_fdlist *lfp_orig); void lc_fdlist_free(struct lc_fdlist *lfp); +void lc_fdlist_print(struct lc_fdlist *lfp, int outFD); /* * Size of an FD list in bytes, including all associated string data. ==== //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_fdlist.c#12 (text+ko) ==== @@ -31,12 +31,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_fdlist.c#11 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_fdlist.c#12 $ */ #include #include +#define _WITH_DPRINTF #include #include #include @@ -202,6 +203,24 @@ free(lfp); } +void +lc_fdlist_print(struct lc_fdlist *lfp, int outFD) +{ + dprintf(outFD, "FD List:\n"); + for(int i = 0; ; ) + { + char *subsystem, *classname, *name; + int fd; + + if (lc_fdlist_getentry(lfp, &subsystem, &classname, &name, &fd, &i) + < 0) + break; + + dprintf(outFD, "% 3d:\t'%s'.'%s': '%s'\n", + fd, subsystem, classname, name); + } +} + int lc_fdlist_add(struct lc_fdlist *lfp, const char *subsystem, const char *classname, const char *name, int fd) @@ -248,7 +267,6 @@ memcpy(lc_fdlist_storage_names(lfsp_copy), tmp, lfsp_copy->namelen); - free(lfsp); lfsp = lfp->lf_storage = lfsp_copy; free(tmp); } From owner-p4-projects@FreeBSD.ORG Mon Apr 26 14:48:35 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 02E9E106567D; Mon, 26 Apr 2010 14:48:35 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8A26E106566C for ; Mon, 26 Apr 2010 14:48:34 +0000 (UTC) (envelope-from jona@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 77D528FC08 for ; Mon, 26 Apr 2010 14:48:34 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3QEmYbO033233 for ; Mon, 26 Apr 2010 14:48:34 GMT (envelope-from jona@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3QEmYSW033231 for perforce@freebsd.org; Mon, 26 Apr 2010 14:48:34 GMT (envelope-from jona@FreeBSD.org) Date: Mon, 26 Apr 2010 14:48:34 GMT Message-Id: <201004261448.o3QEmYSW033231@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jona@FreeBSD.org using -f From: Jonathan Anderson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177356 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, 26 Apr 2010 14:48:35 -0000 http://p4web.freebsd.org/@@177356?ac=10 Change 177356 by jona@jona-belle-freebsd8 on 2010/04/26 14:47:37 Create LD_PRELOAD for sanbdox Affected files ... .. //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host.c#19 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host.c#19 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host.c#18 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host.c#19 $ */ #include @@ -41,6 +41,7 @@ #include #include +#define _WITH_DPRINTF #include #include #include @@ -67,6 +68,8 @@ #define LIBCAPSICUM_CAPMASK_FDLIST CAP_READ | CAP_WRITE | CAP_FTRUNCATE \ | CAP_FSTAT | CAP_MMAP +#define LIBCAPSICUM_CAPMASK_STDOUT CAP_WRITE | CAP_SEEK | CAP_FSTAT + extern char **environ; #define LD_ELF_CAP_SO "ld-elf-cap.so.1" @@ -123,12 +126,12 @@ if (lc_fdlist_addcap(fds, LIBCAPSICUM_FQNAME, "stdout", "", STDOUT_FILENO, - (flags & LCH_PERMIT_STDOUT) ? CAP_WRITE | CAP_SEEK : 0) < 0) + (flags & LCH_PERMIT_STDOUT) ? LIBCAPSICUM_CAPMASK_STDOUT : 0) < 0) err(-1, "Error in lc_fdlist_addcap(stdout)"); if (lc_fdlist_addcap(fds, LIBCAPSICUM_FQNAME, "stderr", "", STDERR_FILENO, - (flags & LCH_PERMIT_STDERR) ? CAP_WRITE | CAP_SEEK : 0) < 0) + (flags & LCH_PERMIT_STDERR) ? LIBCAPSICUM_CAPMASK_STDOUT : 0) < 0) err(-1, "Error in lc_fdlist_addcap(stderr)"); if (lc_fdlist_addcap(fds, LIBCAPSICUM_FQNAME, "socket", "", @@ -147,9 +150,6 @@ fd_binary, LIBCAPSICUM_CAPMASK_SANDBOX) < 0) err(-1, "Error in lc_fdlist_addcap(fd_binary)"); - if (lc_fdlist_append(fds, userfds) < 0) - err(-1, "Error in lc_fdlist_append()"); - /* * Ask RTLD for library path descriptors. * @@ -170,15 +170,23 @@ break; } - for (int j = 0; j < size; j++) - if (lc_fdlist_addcap(fds, RTLD_CAP_FQNAME, "libdir", "", + for (int j = 0; j < size; j++) { + if (lc_fdlist_addcap(fds, RTLD_CAP_FQNAME, "LibraryDirectory", "", libdirs[j], LIBCAPSICUM_CAPMASK_LIBDIR) < 0) err(-1, "Error in lc_fdlist_addcap(libdirs[%d]: %d)", j, libdirs[j]); + } + /* Append user FD list and reorder the descriptors */ + if (lc_fdlist_append(fds, userfds) < 0) + err(-1, "Error in lc_fdlist_append()"); + if (lc_fdlist_reorder(fds) < 0) err(-1, "Error in lc_fdlist_reorder()"); + + + /* * Find the fdlist shared memory segment. */ @@ -228,7 +236,7 @@ err(-1, "Error in setenv(LD_BINARY)"); /* - * Build LD_LIBRARY_DIRS for RTLD. + * Build LD_LIBRARY_DIRS and LD_PRELOAD for RTLD. * * NOTE: This is FreeBSD-specific; porting to other operating systems * will require dynamic linkers capable of operating on file @@ -240,8 +248,9 @@ { int fd; - while (lc_fdlist_lookup(fds, RTLD_CAP_FQNAME, "libdir", NULL, - &fd, &pos) >= 0) + pos = 0; + while (lc_fdlist_lookup(fds, RTLD_CAP_FQNAME, "LibraryDirectory", + NULL, &fd, &pos) >= 0) sbuf_printf(sbufp, "%d:", fd); } @@ -252,10 +261,30 @@ err(-1, "Error in setenv(LD_LIBRARY_DIRS)"); sbuf_delete(sbufp); + sbufp = sbuf_new_auto(); + if (sbufp == NULL) + err(-1, "Error in sbuf_new_auto()"); + + { + int fd; + pos = 0; + while (lc_fdlist_lookup(fds, RTLD_CAP_FQNAME, "PreloadLibrary", + NULL, &fd, &pos) >= 0) + sbuf_printf(sbufp, "%d:", fd); + } + + sbuf_finish(sbufp); + if (sbuf_overflowed(sbufp)) + err(-1, "sbuf_overflowed()"); + if (setenv("LD_PRELOAD", sbuf_data(sbufp), 1) == -1) + err(-1, "Error in setenv(LD_PRELOAD)"); + sbuf_delete(sbufp); + if (cap_enter() < 0) err(-1, "cap_enter() failed"); (void)fexecve(fd_rtld, argv, environ); + dprintf(2, "ERROR: fexecve() failed; errno = %d\n", errno); } int From owner-p4-projects@FreeBSD.ORG Mon Apr 26 19:01:51 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 108E61065670; Mon, 26 Apr 2010 19:01:51 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AFB02106564A for ; Mon, 26 Apr 2010 19:01:50 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 951528FC19 for ; Mon, 26 Apr 2010 19:01:50 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3QJ1oss067476 for ; Mon, 26 Apr 2010 19:01:50 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3QJ1o9E067474 for perforce@freebsd.org; Mon, 26 Apr 2010 19:01:50 GMT (envelope-from mav@freebsd.org) Date: Mon, 26 Apr 2010 19:01:50 GMT Message-Id: <201004261901.o3QJ1o9E067474@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177369 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, 26 Apr 2010 19:01:51 -0000 http://p4web.freebsd.org/@@177369?ac=10 Change 177369 by mav@mav_mavtest on 2010/04/26 19:01:38 Add ATAPI DMA support. Affected files ... .. //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs.c#13 edit .. //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs.h#10 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs.c#13 (text+ko) ==== @@ -421,7 +421,7 @@ { struct mvs_channel *ch = device_get_softc(dev); int timeout; - uint32_t ecfg, fcfg, hc, ltm; + uint32_t ecfg, fcfg, hc, ltm, unkn; if (mode == ch->curr_mode) return; @@ -489,6 +489,14 @@ ATA_OUTL(ch->r_mem, SATA_FISC, fcfg); ATA_OUTL(ch->r_mem, SATA_LTM, ltm); ATA_OUTL(ch->r_mem, EDMA_HC, hc); + /* This is some magic, required to handle several DRQs + * with basic DMA. */ + unkn = ATA_INL(ch->r_mem, EDMA_UNKN_RESD); + if (mode == MVS_EDMA_OFF) + unkn |= 1; + else + unkn &= ~1; + ATA_OUTL(ch->r_mem, EDMA_UNKN_RESD, unkn); } // device_printf(dev, "fisc %08x\n",ATA_INL(ch->r_mem, SATA_FISC)); // device_printf(dev, "ltmode %08x\n",ATA_INL(ch->r_mem, SATA_LTM)); @@ -755,8 +763,11 @@ /* Wait a bit for late !BUSY status update. */ if (status & ATA_S_BUSY) { DELAY(100); - if ((status = mvs_getstatus(dev, 1)) & ATA_S_BUSY) - return; + if ((status = mvs_getstatus(dev, 1)) & ATA_S_BUSY) { + DELAY(1000); + if ((status = mvs_getstatus(dev, 1)) & ATA_S_BUSY) + return; + } } /* if we got an error we are done with the HW */ if (status & ATA_S_ERROR) { @@ -802,7 +813,14 @@ return; } } - } else { + } else if (ch->basic_dma) { /* ATAPI DMA */ + if (status & ATA_S_DWF) + et = MVS_ERR_TFE; + else if (ATA_INL(ch->r_mem, DMA_S) & DMA_S_ERR) + et = MVS_ERR_TFE; + ATA_OUTL(ch->r_mem, DMA_C, 0); + goto end_finished; + } else { /* ATAPI PIO */ length = ATA_INB(ch->r_mem,ATA_CYL_LSB) | (ATA_INB(ch->r_mem,ATA_CYL_MSB) << 8); ireason = ATA_INB(ch->r_mem,ATA_IREASON); //device_printf(dev, "status %02x, ireason %02x, length %d\n", status, ireason, length); @@ -1083,9 +1101,23 @@ ch->aslots |= (1 << slot->slot); } } else { + uint8_t *cdb = (ccb->ccb_h.flags & CAM_CDB_POINTER) ? + ccb->csio.cdb_io.cdb_ptr : ccb->csio.cdb_io.cdb_bytes; ch->numpslots++; + if ((ccb->ccb_h.flags & CAM_DIR_MASK) != CAM_DIR_NONE && + ch->curr[ccb->ccb_h.target_id].mode >= ATA_DMA && + (cdb[0] == 0x08 || + cdb[0] == 0x0a || + cdb[0] == 0x28 || + cdb[0] == 0x2a || + cdb[0] == 0x88 || + cdb[0] == 0x8a || + cdb[0] == 0xa8 || + cdb[0] == 0xaa)) { + ch->basic_dma = 1; + } } - if (ch->numpslots == 0) { + if (ch->numpslots == 0 || ch->basic_dma) { void *buf; bus_size_t size; @@ -1105,11 +1137,53 @@ } } +/* Locked by busdma engine. */ +static void +mvs_dmasetprd(void *arg, bus_dma_segment_t *segs, int nsegs, int error) +{ + struct mvs_slot *slot = arg; + struct mvs_channel *ch = device_get_softc(slot->dev); + struct mvs_eprd *eprd; + int i; + + if (error) { + device_printf(slot->dev, "DMA load error\n"); + mvs_end_transaction(slot, MVS_ERR_INVALID); + return; + } + KASSERT(nsegs <= MVS_SG_ENTRIES, ("too many DMA segment entries\n")); + /* If there is only one segment - no need to use S/G table on Gen-IIe. */ + if (nsegs == 1 && ch->basic_dma == 0 && (ch->quirks & MVS_Q_GENIIE)) { + slot->dma.addr = segs[0].ds_addr; + slot->dma.len = segs[0].ds_len; + } else { + slot->dma.addr = 0; + /* Get a piece of the workspace for this EPRD */ + eprd = (struct mvs_eprd *) + (ch->dma.workrq + MVS_EPRD_OFFSET + (MVS_EPRD_SIZE * slot->slot)); + /* Fill S/G table */ + for (i = 0; i < nsegs; i++) { + eprd[i].prdbal = htole32(segs[i].ds_addr); + eprd[i].bytecount = htole32(segs[i].ds_len & MVS_EPRD_MASK); + eprd[i].prdbah = htole32((segs[i].ds_addr >> 16) >> 16); + } + eprd[i - 1].bytecount |= htole32(MVS_EPRD_EOF); + } + bus_dmamap_sync(ch->dma.data_tag, slot->dma.data_map, + ((slot->ccb->ccb_h.flags & CAM_DIR_IN) ? + BUS_DMASYNC_PREREAD : BUS_DMASYNC_PREWRITE)); + if (ch->basic_dma) + mvs_legacy_execute_transaction(slot); + else + mvs_execute_transaction(slot); +} + static void mvs_legacy_execute_transaction(struct mvs_slot *slot) { device_t dev = slot->dev; struct mvs_channel *ch = device_get_softc(dev); + bus_addr_t eprd; union ccb *ccb = slot->ccb; int port = ccb->ccb_h.target_id & 0x0f; int timeout; @@ -1148,14 +1222,21 @@ ch->transfersize / 2); } } else { -// device_printf(dev, "%d ATAPI command %02x size %d\n", -// port, ccb->csio.cdb_io.cdb_bytes[0], ccb->csio.dxfer_len); +// device_printf(dev, "%d ATAPI command %02x size %d dma %d\n", +// port, ccb->csio.cdb_io.cdb_bytes[0], ccb->csio.dxfer_len, +// ch->basic_dma); ch->donecount = 0; ch->transfersize = min(ccb->csio.dxfer_len, ch->curr[port].bytecount); - ATA_OUTB(ch->r_mem, ATA_FEATURE, 0); - ATA_OUTB(ch->r_mem, ATA_CYL_LSB, ch->transfersize); - ATA_OUTB(ch->r_mem, ATA_CYL_MSB, ch->transfersize >> 8); + if (ch->basic_dma) { + ATA_OUTB(ch->r_mem, ATA_FEATURE, ATA_F_DMA); + ATA_OUTB(ch->r_mem, ATA_CYL_LSB, 0); + ATA_OUTB(ch->r_mem, ATA_CYL_MSB, 0); + } else { + ATA_OUTB(ch->r_mem, ATA_FEATURE, 0); + ATA_OUTB(ch->r_mem, ATA_CYL_LSB, ch->transfersize); + ATA_OUTB(ch->r_mem, ATA_CYL_MSB, ch->transfersize >> 8); + } ATA_OUTB(ch->r_mem, ATA_COMMAND, ATA_PACKET_CMD); ch->fake_busy = 1; /* wait for ready to write ATAPI command block */ @@ -1183,53 +1264,23 @@ (uint16_t *)((ccb->ccb_h.flags & CAM_CDB_POINTER) ? ccb->csio.cdb_io.cdb_ptr : ccb->csio.cdb_io.cdb_bytes), ch->curr[port].atapi / 2); - if ((ccb->ccb_h.flags & CAM_DIR_MASK) != CAM_DIR_NONE) + DELAY(10); + if (ch->basic_dma) { + eprd = ch->dma.workrq_bus + MVS_EPRD_OFFSET + + (MVS_EPRD_SIZE * slot->slot); + ATA_OUTL(ch->r_mem, DMA_DTLBA, eprd); + ATA_OUTL(ch->r_mem, DMA_DTHBA, (eprd >> 16) >> 16); + ATA_OUTL(ch->r_mem, DMA_C, DMA_C_START | + (((ccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) ? + DMA_C_READ : 0)); + } else if ((ccb->ccb_h.flags & CAM_DIR_MASK) != CAM_DIR_NONE) ch->fake_busy = 1; - DELAY(10); } /* Start command execution timeout */ callout_reset(&slot->timeout, (int)ccb->ccb_h.timeout * hz / 1000, (timeout_t*)mvs_timeout, slot); } -/* Locked by busdma engine. */ -static void -mvs_dmasetprd(void *arg, bus_dma_segment_t *segs, int nsegs, int error) -{ - struct mvs_slot *slot = arg; - struct mvs_channel *ch = device_get_softc(slot->dev); - struct mvs_eprd *eprd; - int i; - - if (error) { - device_printf(slot->dev, "DMA load error\n"); - mvs_end_transaction(slot, MVS_ERR_INVALID); - return; - } - KASSERT(nsegs <= MVS_SG_ENTRIES, ("too many DMA segment entries\n")); - /* If there is only one segment - no need to use S/G table on Gen-IIe. */ - if (nsegs == 1 && (ch->quirks & MVS_Q_GENIIE)) { - slot->dma.addr = segs[0].ds_addr; - slot->dma.len = segs[0].ds_len; - } else { - slot->dma.addr = 0; - /* Get a piece of the workspace for this EPRD */ - eprd = (struct mvs_eprd *) - (ch->dma.workrq + MVS_EPRD_OFFSET + (MVS_EPRD_SIZE * slot->slot)); - /* Fill S/G table */ - for (i = 0; i < nsegs; i++) { - eprd[i].prdbal = htole32(segs[i].ds_addr); - eprd[i].bytecount = htole32(segs[i].ds_len & MVS_EPRD_MASK); - eprd[i].prdbah = htole32((segs[i].ds_addr >> 16) >> 16); - } - eprd[i - 1].bytecount |= htole32(MVS_EPRD_EOF); - } - bus_dmamap_sync(ch->dma.data_tag, slot->dma.data_map, - ((slot->ccb->ccb_h.flags & CAM_DIR_IN) ? - BUS_DMASYNC_PREREAD : BUS_DMASYNC_PREWRITE)); - mvs_execute_transaction(slot); -} - /* Must be called with channel locked. */ static void mvs_execute_transaction(struct mvs_slot *slot) @@ -1438,7 +1489,7 @@ } else bzero(res, sizeof(*res)); } - if (ch->numpslots == 0) { + if (ch->numpslots == 0 || ch->basic_dma) { if ((ccb->ccb_h.flags & CAM_DIR_MASK) != CAM_DIR_NONE) { bus_dmamap_sync(ch->dma.data_tag, slot->dma.data_map, (ccb->ccb_h.flags & CAM_DIR_IN) ? @@ -1523,8 +1574,10 @@ } else { ch->numpslots--; } - } else + } else { ch->numpslots--; + ch->basic_dma = 0; + } /* If it was our READ LOG command - process it. */ if (ch->readlog) { mvs_process_read_log(dev, ccb); @@ -1718,6 +1771,7 @@ mvs_requeue_frozen(dev); /* Kill the engine and requeue all running commands. */ mvs_set_edma_mode(dev, MVS_EDMA_OFF); + ATA_OUTL(ch->r_mem, DMA_C, 0); for (i = 0; i < MVS_MAX_SLOTS; i++) { /* Do we have a running request on slot? */ if (ch->slot[i].state < MVS_SLOT_RUNNING) ==== //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs.h#10 (text+ko) ==== @@ -171,6 +171,7 @@ #define EDMA_IORT 0x34 /* IORdy Timeout */ #define EDMA_CDT 0x40 /* Command Delay Threshold */ #define EDMA_HC 0x60 /* Halt Condition */ +#define EDMA_UNKN_RESD 0x6C /* Unknown register */ #define EDMA_CQDCQOS(x) (0x90 + ((x) << 2) /* NCQ Done/TCQ Outstanding Status */ @@ -235,6 +236,10 @@ #define DMA_C_CONTFROMPREV (1 << 10) #define DMA_C_DRBC(n) (((n) & 0xffff) << 16) #define DMA_S 0x228 /* Basic DMA Status */ +#define DMA_S_ACT (1 << 0) /* Active */ +#define DMA_S_ERR (1 << 1) /* Error */ +#define DMA_S_PAUSED (1 << 2) /* Paused */ +#define DMA_S_LAST (1 << 3) /* Last */ #define DMA_DTLBA 0x22c /* Descriptor Table Low Base Address */ #define DMA_DTLBA_MASK 0xfffffff0 #define DMA_DTHBA 0x230 /* Descriptor Table High Base Address */ @@ -556,6 +561,7 @@ int in_idx; /* Next read CRPB */ u_int transfersize; /* PIO transfer size */ u_int donecount; /* PIO bytes sent/received */ + u_int basic_dma; /* Basic DMA used for ATAPI */ u_int fake_busy; /* Fake busy bit after command submission */ union ccb *frozen; /* Frozen command */ struct callout pm_timer; /* Power management events */ From owner-p4-projects@FreeBSD.ORG Mon Apr 26 19:36:26 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0043E1065675; Mon, 26 Apr 2010 19:36:26 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B867A106564A for ; Mon, 26 Apr 2010 19:36:25 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A57678FC22 for ; Mon, 26 Apr 2010 19:36:25 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3QJaPRi071434 for ; Mon, 26 Apr 2010 19:36:25 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3QJaP2f071432 for perforce@freebsd.org; Mon, 26 Apr 2010 19:36:25 GMT (envelope-from rene@FreeBSD.org) Date: Mon, 26 Apr 2010 19:36:25 GMT Message-Id: <201004261936.o3QJaP2f071432@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177374 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, 26 Apr 2010 19:36:26 -0000 http://p4web.freebsd.org/@@177374?ac=10 Change 177374 by rene@rene_acer on 2010/04/26 19:35:59 Add Denis E Podolskiy for graphics/libjpeg-turbo Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#56 edit Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#56 (text+ko) ==== @@ -2363,6 +2363,11 @@ + Denis E. Podolskiy + bytestore@yandex.ru + + + Denis Shaposhnikov dsh@vlink.ru From owner-p4-projects@FreeBSD.ORG Tue Apr 27 08:19:16 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 40C6C1065672; Tue, 27 Apr 2010 08:19:16 +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 05567106566C for ; Tue, 27 Apr 2010 08:19:16 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E7AB58FC0C for ; Tue, 27 Apr 2010 08:19:15 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3R8JFrD074058 for ; Tue, 27 Apr 2010 08:19:15 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3R8JFkK074056 for perforce@freebsd.org; Tue, 27 Apr 2010 08:19:15 GMT (envelope-from rene@FreeBSD.org) Date: Tue, 27 Apr 2010 08:19:15 GMT Message-Id: <201004270819.o3R8JFkK074056@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177391 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, 27 Apr 2010 08:19:16 -0000 http://p4web.freebsd.org/@@177391?ac=10 Change 177391 by rene@rene_acer on 2010/04/27 08:19:08 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#57 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#57 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -463,7 +463,7 @@ OpenOffice.org heavy huge - &jdk; 1.4, Mozilla + &jdk;, Mozilla @@ -638,7 +638,7 @@ During the first launch, you will be asked some - questions and a .openoffice.org2 folder + questions and a .openoffice.org folder will be created in your home directory. @@ -647,7 +647,7 @@ port. However, you must bear in mind that it requires a lot of disk space and a fairly long time to compile. - &prompt.root; cd /usr/ports/editors/openoffice.org-2 + &prompt.root; cd /usr/ports/editors/openoffice.org-3 &prompt.root; make install clean @@ -743,10 +743,10 @@ for Linux. As FreeBSD can run Linux binaries, it is also available for FreeBSD. - To install &acrobat.reader; 7 from + To install &acrobat.reader; 9 from the Ports collection, do: - &prompt.root; cd /usr/ports/print/acroread7 + &prompt.root; cd /usr/ports/print/acroread9 &prompt.root; make install clean A package is not available due to licencing restrictions. @@ -1088,13 +1088,13 @@ OpenOffice.org openoffice - editors/openoffice-1.1 + editors/openoffice-3 &acrobat.reader; acroread - print/acroread7 + print/acroread9 ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#77 (text+ko) ==== @@ -1,7 +1,7 @@ The Mesa Project is an effort to provide free OpenGL implementation. You can specify a dependency on various components of this project with USE_GL variable. - Valid options are: glut, glu, glw, gl and + Valid options are: glut, glu, glw, glew, gl and linux. For backwards compatibility, the value of yes maps to glu. ==== //depot/projects/docproj_nl/www/share/sgml/events.xml#27 (text+ko) ==== @@ -10,7 +10,7 @@ - $FreeBSD: www/share/sgml/events.xml,v 1.82 2010/02/20 11:22:05 brueffer Exp $ + $FreeBSD: www/share/sgml/events.xml,v 1.83 2010/04/28 11:37:13 danger Exp $ @@ -111,6 +111,31 @@ track, tutorials, and FreeBSD developer summit.
                  + + meetBSD 2010 + http://www.meetBSD.org/ + + 2010 + 7 + 2 + + + 2010 + 7 + 3 + + + Poland + Krakow + Jagiellonian University + + meetBSD is an annual event gathering users and developers of + the BSD operating systems family, mostly &os;, NetBSD and OpenBSD. + After the special California edition for the 10th FreeBSD anniversary, + meetBSD Wintercamp in Livigno, this year we are back to Krakow, + Poland. + + 11th Libre Software Meeting http://2010.rmll.info/ ==== //depot/projects/docproj_nl/www/share/sgml/news.xml#78 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.315 2010/04/24 23:29:19 danger Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.316 2010/04/30 07:15:32 mm Exp $ @@ -36,6 +36,16 @@ 4 + 29 + + +

                  Enhanced commit privileges: Martin Matuška + (src, ports)

                  +
                  +
                  + + 22 From owner-p4-projects@FreeBSD.ORG Fri Apr 30 13:39:13 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F27410656E0; Fri, 30 Apr 2010 13:39:13 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 42B701065676 for ; Fri, 30 Apr 2010 13:39:13 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3254D8FC21 for ; Fri, 30 Apr 2010 13:39:13 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3UDdD2R010727 for ; Fri, 30 Apr 2010 13:39:13 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3UDdDpW010725 for perforce@freebsd.org; Fri, 30 Apr 2010 13:39:13 GMT (envelope-from rene@FreeBSD.org) Date: Fri, 30 Apr 2010 13:39:13 GMT Message-Id: <201004301339.o3UDdDpW010725@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177519 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, 30 Apr 2010 13:39:13 -0000 http://p4web.freebsd.org/@@177519?ac=10 Change 177519 by rene@rene_acer on 2010/04/30 13:38:50 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#12 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#12 (text+ko) ==== @@ -1,6 +1,6 @@ @@ -743,10 +743,10 @@ for Linux. As FreeBSD can run Linux binaries, it is also available for FreeBSD. - To install &acrobat.reader; 9 from + To install &acrobat.reader; 8 from the Ports collection, do: - &prompt.root; cd /usr/ports/print/acroread9 + &prompt.root; cd /usr/ports/print/acroread8 &prompt.root; make install clean A package is not available due to licencing restrictions. @@ -1094,7 +1094,7 @@ &acrobat.reader; acroread - print/acroread9 + print/acroread8 From owner-p4-projects@FreeBSD.ORG Fri Apr 30 14:17:52 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5CDB81065674; Fri, 30 Apr 2010 14:17:52 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 147C7106566C for ; Fri, 30 Apr 2010 14:17:52 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 03B3D8FC1E for ; Fri, 30 Apr 2010 14:17:52 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3UEHp98014523 for ; Fri, 30 Apr 2010 14:17:51 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3UEHpHG014521 for perforce@freebsd.org; Fri, 30 Apr 2010 14:17:51 GMT (envelope-from rene@FreeBSD.org) Date: Fri, 30 Apr 2010 14:17:51 GMT Message-Id: <201004301417.o3UEHpHG014521@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177520 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, 30 Apr 2010 14:17:52 -0000 http://p4web.freebsd.org/@@177520?ac=10 Change 177520 by rene@rene_acer on 2010/04/30 14:17:24 MFen handbook/desktop 1.91 -> 1.94 While here, use the correct port name for openoffice.org3 (to be PR'd) Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#22 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#22 (text+ko) ==== @@ -4,7 +4,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.21 2009/08/26 06:04:09 rene Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/desktop/chapter.sgml - %SRCID% 1.91 + %SRCID% 1.94 --> @@ -501,7 +501,7 @@ erg zwaar - &jdk; 1.4, + &jdk;, Mozilla @@ -675,7 +675,7 @@ Tijdens de eerste keer starten worden er een aantal vragen - gesteld en wordt de map .openoffice.org2 + gesteld en wordt de map .openoffice.org in de thuismap van de aangemelde gebruiker gemaakt. @@ -683,7 +683,7 @@ niet beschikbaar zijn, kan het uit de ports gecompileerd worden. Hiervoor is veel schijfruimte en tijd nodig: - &prompt.root; cd /usr/ports/editors/openoffice.org-2 + &prompt.root; cd /usr/ports/editors/openoffice.org-3 &prompt.root; make install clean @@ -794,10 +794,10 @@ &linux; heeft uitgegeven. Omdat &os; &linux; binaries kan draaien, is het ook beschikbaar voor &os;. - Om &acrobat.reader; 5 te + Om &acrobat.reader; 8 te installeren uit de Portscollectie: - &prompt.root; cd /usr/ports/print/acroread7 + &prompt.root; cd /usr/ports/print/acroread8 &prompt.root; make install clean Vanwege de licentie is een pakket niet beschikbaar. @@ -1178,7 +1178,7 @@ openoffice - editors/openoffice-1.1 + editors/openoffice.org-3 @@ -1186,7 +1186,7 @@ acroread - print/acroread7 + print/acroread8 From owner-p4-projects@FreeBSD.ORG Fri Apr 30 14:28:03 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 31B8E1065670; Fri, 30 Apr 2010 14:28:03 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E9DE2106566B for ; Fri, 30 Apr 2010 14:28:02 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D77FA8FC12 for ; Fri, 30 Apr 2010 14:28:02 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3UES2Nv015386 for ; Fri, 30 Apr 2010 14:28:02 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3UES288015384 for perforce@freebsd.org; Fri, 30 Apr 2010 14:28:02 GMT (envelope-from mav@freebsd.org) Date: Fri, 30 Apr 2010 14:28:02 GMT Message-Id: <201004301428.o3UES288015384@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177521 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, 30 Apr 2010 14:28:03 -0000 http://p4web.freebsd.org/@@177521?ac=10 Change 177521 by mav@mav_mavtest on 2010/04/30 14:27:56 IFC Affected files ... .. //depot/projects/scottl-camlock/src/UPDATING#30 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/ChangeLog#5 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/README#5 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/auth-options.c#4 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/auth2-pubkey.c#5 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/channels.c#5 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/clientloop.c#5 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/config.h#7 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/config.h.in#4 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/defines.h#6 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/key.c#4 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/key.h#4 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/loginrec.c#5 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/logintest.c#2 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/openbsd-compat/bsd-arc4random.c#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/servconf.c#5 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/session.c#5 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/ssh-keygen.1#4 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/ssh-keygen.c#5 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/ssh-pkcs11-helper.c#2 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/ssh.1#5 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/ssh_config#5 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/ssh_config.5#5 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/sshd_config#6 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/sshd_config.5#5 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/version.h#5 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/named#5 integrate .. //depot/projects/scottl-camlock/src/gnu/usr.bin/groff/tmac/mdoc.local#9 integrate .. //depot/projects/scottl-camlock/src/sbin/hastd/hast.conf.5#2 integrate .. //depot/projects/scottl-camlock/src/sbin/hastd/hast.h#2 integrate .. //depot/projects/scottl-camlock/src/sbin/hastd/hastd.c#3 integrate .. //depot/projects/scottl-camlock/src/sbin/hastd/metadata.c#2 integrate .. //depot/projects/scottl-camlock/src/sbin/hastd/parse.y#2 integrate .. //depot/projects/scottl-camlock/src/sbin/hastd/primary.c#4 integrate .. //depot/projects/scottl-camlock/src/sbin/hastd/proto.c#2 integrate .. //depot/projects/scottl-camlock/src/sbin/hastd/proto.h#2 integrate .. //depot/projects/scottl-camlock/src/sbin/hastd/proto_common.c#2 integrate .. //depot/projects/scottl-camlock/src/sbin/hastd/proto_tcp4.c#2 integrate .. //depot/projects/scottl-camlock/src/sbin/hastd/secondary.c#2 integrate .. //depot/projects/scottl-camlock/src/sbin/hastd/token.l#2 integrate .. //depot/projects/scottl-camlock/src/sbin/ifconfig/ifconfig.8#12 integrate .. //depot/projects/scottl-camlock/src/sbin/ifconfig/ifieee80211.c#12 integrate .. //depot/projects/scottl-camlock/src/sbin/tunefs/tunefs.c#5 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/bwn.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/sge.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/vlan.4#5 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/ieee80211.9#5 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/ieee80211_node.9#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/io.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/pmap.c#43 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/iodev.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/pmap.h#16 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/vmparam.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/pmap.c#30 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/pmap.h#20 integrate .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#86 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#155 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files#74 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acpica_prep.sh#7 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/changes.txt#9 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/common/adisasm.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslcompile.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslcompiler.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/asldefine.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslfiles.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslglobal.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/asllisting.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslmain.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslpredef.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslresource.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslrestype1.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslrestype1i.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslrestype2.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslrestype2d.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslrestype2e.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslrestype2q.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslrestype2w.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/asltypes.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/debugger/dbcmds.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/debugger/dbdisply.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/events/evgpe.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/events/evgpeblk.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/events/evgpeinit.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/events/evgpeutil.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exconfig.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exoparg1.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exsystem.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acevents.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acglobal.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acinterp.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/aclocal.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acpiosxf.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acpixf.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/actypes.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/amlresrc.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/osunixxf.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/tables/tbfind.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/tables/tbinstal.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/tables/tbutils.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/tables/tbxface.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utilities/utcopy.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utilities/utglobal.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utilities/uttrack.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_auth.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/Osd/OsdHardware.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#108 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.c#54 integrate .. //depot/projects/scottl-camlock/src/sys/dev/atkbdc/atkbdc.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/atkbdc/atkbdc_ebus.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/atkbdc/atkbdc_isa.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/atkbdc/atkbdcreg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bce/if_bce.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bce/if_bcereg.h#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ciss/ciss.c#29 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/via_dmablit.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/via_video.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_em.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/dev/io/iodev.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/io/iodev.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/mii/brgphy.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/dev/msk/if_msk.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/dev/msk/if_mskreg.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sge/if_sge.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sge/if_sgereg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#46 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/buffer.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clnode.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clrpcops.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/io.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/pmap.c#47 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/iodev.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/pmap.h#23 integrate .. //depot/projects/scottl-camlock/src/sys/i386/xen/pmap.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/iodev_machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/pmap.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/iodev.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/pmap.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/kern/imgact_elf.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_exec.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_gzio.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_ntptime.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_proc.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_sig.c#33 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_witness.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sys_pipe.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sys_process.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_cow.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_bio.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/pmap.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/pmap.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/modules/acpi/acpi/Makefile#17 integrate .. //depot/projects/scottl-camlock/src/sys/modules/usb/usb/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sys/net/bpf_zerocopy.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/net/flowtable.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/net/if.c#46 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_gif.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_gif.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/net/route.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_amrr.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_ht.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_node.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_rssadapt.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_var.h#24 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_pipe.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/icmp6.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/if_ether.c#31 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in.c#34 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in_gif.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in_proto.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in_rmx.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_icmp.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_icmp.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_input.c#32 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_var.h#19 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_hostcache.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_input.c#34 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_output.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_reass.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_sack.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_subr.c#29 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_syncache.c#28 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_timewait.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_var.h#29 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/udp_usrreq.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/udp_var.h#13 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/frag6.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/icmp6.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6_gif.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6_ifattach.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6_proto.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6_rmx.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6_src.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6_var.h#17 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/ip6_input.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/ip6_mroute.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/ip6_var.h#15 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/nd6.c#32 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/nd6.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/nd6_nbr.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/nd6_rtr.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/raw_ip6.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/scope6.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/ah_var.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/esp_var.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/ipcomp_var.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/ipip_var.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/ipsec.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/ipsec.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/ipsec6.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/key.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/xform_esp.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/pc98/machdep.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/aim/mmu_oea.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/aim/mmu_oea64.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/booke/pmap.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/include/pmap.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/include/pmap.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/pmap.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/sun4v/include/pmap.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/pmap.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/sys/param.h#43 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_softdep.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_vfsops.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/vm/device_pager.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/vm/sg_pager.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/vm/swap_pager.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/vm/uma_core.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_contig.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_fault.c#32 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_glue.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_kern.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_mmap.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_object.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_page.c#27 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_page.h#15 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_pageout.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_param.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vnode_pager.c#18 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/acpi/acpidb/Makefile#7 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/acpi/iasl/Makefile#6 integrate Differences ... ==== //depot/projects/scottl-camlock/src/UPDATING#30 (text+ko) ==== @@ -22,6 +22,14 @@ machines to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) + +20100429: + 'vm_page's are now hashed by physical address to an array of mutexes. + Currently this is only used to serialize access to hold_count. Over + time the page queue mutex will be peeled away. This changes the size + of pmap on every architecture. And requires all callers of vm_page_hold + and vm_page_unhold to be updated. + 20100402: WITH_CTF can now be specified in src.conf (not recommended, there are some problems with static executables), make.conf (would also @@ -1130,4 +1138,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.657 2010/04/02 06:55:31 netchild Exp $ +$FreeBSD: src/UPDATING,v 1.658 2010/04/30 00:46:43 kmacy Exp $ ==== //depot/projects/scottl-camlock/src/crypto/openssh/ChangeLog#5 (text+ko) ==== @@ -1,4 +1,120 @@ -20100307 +20100410 + - (dtucker) [configure.ac] Put the check for the existence of getaddrinfo + back so we disable the IPv6 tests if we don't have it. + +20100409 + - (dtucker) [contrib/cygwin/Makefile] Don't overwrite files with the wrong + ones. Based on a patch from Roumen Petrov. + - (dtucker) [configure.ac] Bug #1744: use pkg-config for libedit flags if we + have it and the path is not provided to --with-libedit. Based on a patch + from Iain Morgan. + - (dtucker) [configure.ac defines.h loginrec.c logintest.c] Bug #1732: enable + utmpx support on FreeBSD where possible. Patch from Ed Schouten, ok djm@ + +20100326 + - (djm) [openbsd-compat/bsd-arc4random.c] Fix preprocessor detection + for arc4random_buf() and arc4random_uniform(); from Josh Gilkerson + - (dtucker) [configure.ac] Bug #1741: Add section for Haiku, patch originally + by Ingo Weinhold via Scott McCreary, ok djm@ + - (djm) OpenBSD CVS Sync + - djm@cvs.openbsd.org 2010/03/25 23:38:28 + [servconf.c] + from portable: getcwd(NULL, 0) doesn't work on all platforms, so + use a stack buffer; ok dtucker@ + - djm@cvs.openbsd.org 2010/03/26 00:26:58 + [ssh.1] + mention that -S none disables connection sharing; from Colin Watson + - (djm) [session.c] Allow ChrootDirectory to work on SELinux platforms - + set up SELinux execution context before chroot() call. From Russell + Coker via Colin watson; bz#1726 ok dtucker@ + - (djm) [channels.c] Check for EPFNOSUPPORT as a socket() errno; bz#1721 + ok dtucker@ + - (dtucker) Bug #1725: explicitly link libX11 into gnome-ssh-askpass2 using + pkg-config, patch from Colin Watson. Needed for newer linkers (ie gold). + - (djm) [contrib/ssh-copy-id] Don't blow up when the agent has no keys; + bz#1723 patch from Adeodato Simóvia Colin Watson; ok dtucker@ + - (dtucker) OpenBSD CVS Sync + - dtucker@cvs.openbsd.org 2010/03/26 01:06:13 + [ssh_config.5] + Reformat default value of PreferredAuthentications entry (current + formatting implies ", " is acceptable as a separator, which it's not. + ok djm@ + +20100324 + - (dtucker) [contrib/cygwin/ssh-host-config] Mount the Windows directory + containing the services file explicitely case-insensitive. This allows to + tweak the Windows services file reliably. Patch from vinschen at redhat. + +20100321 + - (djm) OpenBSD CVS Sync + - jmc@cvs.openbsd.org 2010/03/08 09:41:27 + [ssh-keygen.1] + sort the list of constraints (to -O); ok djm + - jmc@cvs.openbsd.org 2010/03/10 07:40:35 + [ssh-keygen.1] + typos; from Ross Richardson + closes prs 6334 and 6335 + - djm@cvs.openbsd.org 2010/03/10 23:27:17 + [auth2-pubkey.c] + correct certificate logging and make it more consistent between + authorized_keys and TrustedCAKeys; ok markus@ + - djm@cvs.openbsd.org 2010/03/12 01:06:25 + [servconf.c] + unbreak AuthorizedKeys option with a $HOME-relative path; reported by + vinschen AT redhat.com, ok dtucker@ + - markus@cvs.openbsd.org 2010/03/12 11:37:40 + [servconf.c] + do not prepend AuthorizedKeysFile with getcwd(), unbreaks relative paths + free() (not xfree()) the buffer returned by getcwd() + - djm@cvs.openbsd.org 2010/03/13 21:10:38 + [clientloop.c] + protocol conformance fix: send language tag when disconnecting normally; + spotted by 1.41421 AT gmail.com, ok markus@ deraadt@ + - djm@cvs.openbsd.org 2010/03/13 21:45:46 + [ssh-keygen.1] + Certificates are named *-cert.pub, not *_cert.pub; committing a diff + from stevesk@ ok me + - jmc@cvs.openbsd.org 2010/03/13 23:38:13 + [ssh-keygen.1] + fix a formatting error (args need quoted); noted by stevesk + - stevesk@cvs.openbsd.org 2010/03/15 19:40:02 + [key.c key.h ssh-keygen.c] + also print certificate type (user or host) for ssh-keygen -L + ok djm kettenis + - stevesk@cvs.openbsd.org 2010/03/16 15:46:52 + [auth-options.c] + spelling in error message. ok djm kettenis + - djm@cvs.openbsd.org 2010/03/16 16:36:49 + [version.h] + crank version to openssh-5.5 since we have a few fixes since 5.4; + requested deraadt@ kettenis@ + - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec] + [contrib/suse/openssh.spec] Crank version numbers + +20100314 + - (djm) [ssh-pkcs11-helper.c] Move #ifdef to after #defines to fix + compilation failure when !HAVE_DLOPEN. Reported by felix-mindrot + AT fefe.de + - (djm) [Makefile.in] Respecify -lssh after -lopenbsd-compat for + ssh-pkcs11-helper to repair static builds (we do the same for + ssh-keyscan). Reported by felix-mindrot AT fefe.de + +20100312 + - (tim) [Makefile.in] Now that scard is gone, no need to make $(datadir) + - (tim) [Makefile.in] Add missing $(EXEEXT) to install targets. + Patch from Corinna Vinschen. + - (tim) [contrib/cygwin/Makefile] Fix list of documentation files to install + on a Cygwin installation. Patch from Corinna Vinschen. + +20100311 + - (tim) [contrib/suse/openssh.spec] crank version number here too. + report by imorgan AT nas.nasa.gov + +20100309 + - (dtucker) [configure.ac] Use a proper AC_CHECK_DECL for BROKEN_GETADDRINFO + so setting it in CFLAGS correctly skips IPv6 tests. + +20100428 - (djm) OpenBSD CVS Sync - djm@cvs.openbsd.org 2010/03/07 22:16:01 [ssh-keygen.c] ==== //depot/projects/scottl-camlock/src/crypto/openssh/README#5 (text+ko) ==== @@ -1,4 +1,4 @@ -See http://www.openssh.com/txt/release-5.4 for the release notes. +See http://www.openssh.com/txt/release-5.5 for the release notes. - A Japanese translation of this document and of the OpenSSH FAQ is - available at http://www.unixuser.org/~haruyama/security/openssh/index.html @@ -62,4 +62,4 @@ [6] http://www.openbsd.org/cgi-bin/man.cgi?query=style&sektion=9 [7] http://www.openssh.com/faq.html -$Id: README,v 1.72 2010/03/07 22:41:02 djm Exp $ +$Id: README,v 1.73 2010/03/21 19:11:55 djm Exp $ ==== //depot/projects/scottl-camlock/src/crypto/openssh/auth-options.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $OpenBSD: auth-options.c,v 1.48 2010/03/07 11:57:13 dtucker Exp $ */ +/* $OpenBSD: auth-options.c,v 1.49 2010/03/16 15:46:52 stevesk Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -434,7 +434,7 @@ goto out; } if (strlen(command) != clen) { - error("force-command constrain contains \\0"); + error("force-command constraint contains \\0"); goto out; } if (cert_forced_command != NULL) { @@ -454,7 +454,7 @@ goto out; } if (strlen(allowed) != clen) { - error("source-address constrain contains \\0"); + error("source-address constraint contains \\0"); goto out; } if (cert_source_address_done++) { ==== //depot/projects/scottl-camlock/src/crypto/openssh/auth2-pubkey.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2-pubkey.c,v 1.21 2010/03/04 10:36:03 djm Exp $ */ +/* $OpenBSD: auth2-pubkey.c,v 1.22 2010/03/10 23:27:17 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -240,22 +240,26 @@ continue; if (!key_equal(found, key->cert->signature_key)) continue; - debug("matching CA found: file %s, line %lu", - file, linenum); fp = key_fingerprint(found, SSH_FP_MD5, SSH_FP_HEX); - verbose("Found matching %s CA: %s", - key_type(found), fp); - xfree(fp); + debug("matching CA found: file %s, line %lu, %s %s", + file, linenum, key_type(found), fp); if (key_cert_check_authority(key, 0, 0, pw->pw_name, &reason) != 0) { + xfree(fp); error("%s", reason); auth_debug_add("%s", reason); continue; } if (auth_cert_constraints(&key->cert->constraints, - pw) != 0) + pw) != 0) { + xfree(fp); continue; + } + verbose("Accepted certificate ID \"%s\" " + "signed by %s CA %s via %s", key->cert->key_id, + key_type(found), fp, file); + xfree(fp); found_key = 1; break; } else if (!key_is_cert_authority && key_equal(found, key)) { @@ -281,15 +285,15 @@ static int user_cert_trusted_ca(struct passwd *pw, Key *key) { - char *key_fp, *ca_fp; + char *ca_fp; const char *reason; int ret = 0; if (!key_is_cert(key) || options.trusted_user_ca_keys == NULL) return 0; - key_fp = key_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX); - ca_fp = key_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX); + ca_fp = key_fingerprint(key->cert->signature_key, + SSH_FP_MD5, SSH_FP_HEX); if (key_in_file(key->cert->signature_key, options.trusted_user_ca_keys, 1) != 1) { @@ -306,13 +310,12 @@ if (auth_cert_constraints(&key->cert->constraints, pw) != 0) goto out; - verbose("%s certificate %s allowed by trusted %s key %s", - key_type(key), key_fp, key_type(key->cert->signature_key), ca_fp); + verbose("Accepted certificate ID \"%s\" signed by %s CA %s via %s", + key->cert->key_id, key_type(key->cert->signature_key), ca_fp, + options.trusted_user_ca_keys); ret = 1; out: - if (key_fp != NULL) - xfree(key_fp); if (ca_fp != NULL) xfree(ca_fp); return ret; ==== //depot/projects/scottl-camlock/src/crypto/openssh/channels.c#5 (text+ko) ==== @@ -3252,7 +3252,11 @@ sock = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol); if (sock < 0) { - if ((errno != EINVAL) && (errno != EAFNOSUPPORT)) { + if ((errno != EINVAL) && (errno != EAFNOSUPPORT) +#ifdef EPFNOSUPPORT + && (errno != EPFNOSUPPORT) +#endif + ) { error("socket: %.100s", strerror(errno)); freeaddrinfo(aitop); return -1; ==== //depot/projects/scottl-camlock/src/crypto/openssh/clientloop.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $OpenBSD: clientloop.c,v 1.218 2010/01/28 00:21:18 djm Exp $ */ +/* $OpenBSD: clientloop.c,v 1.219 2010/03/13 21:10:38 djm Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -1484,6 +1484,7 @@ packet_start(SSH2_MSG_DISCONNECT); packet_put_int(SSH2_DISCONNECT_BY_APPLICATION); packet_put_cstring("disconnected by user"); + packet_put_cstring(""); /* language tag */ packet_send(); packet_write_wait(); } ==== //depot/projects/scottl-camlock/src/crypto/openssh/config.h#7 (text+ko) ==== @@ -124,7 +124,7 @@ #define DISABLE_WTMPX 1 /* Enable for PKCS#11 support */ -#define ENABLE_PKCS11 +#define ENABLE_PKCS11 /**/ /* Builtin PRNG command timeout */ #define ENTROPY_TIMEOUT_MSEC 200 @@ -456,6 +456,9 @@ /* Define to 1 if you have the `getutxline' function. */ #define HAVE_GETUTXLINE 1 +/* Define to 1 if you have the `getutxuser' function. */ +#define HAVE_GETUTXUSER 1 + /* Define to 1 if you have the `get_default_context_with_level' function. */ /* #undef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL */ @@ -552,6 +555,9 @@ /* Define if system has libiaf that supports set_id */ /* #undef HAVE_LIBIAF */ +/* Define to 1 if you have the `network' library (-lnetwork). */ +/* #undef HAVE_LIBNETWORK */ + /* Define to 1 if you have the `nsl' library (-lnsl). */ /* #undef HAVE_LIBNSL */ @@ -805,6 +811,9 @@ /* Define to 1 if you have the `setutent' function. */ /* #undef HAVE_SETUTENT */ +/* Define to 1 if you have the `setutxdb' function. */ +#define HAVE_SETUTXDB 1 + /* Define to 1 if you have the `setutxent' function. */ #define HAVE_SETUTXENT 1 @@ -1416,8 +1425,8 @@ /* Define if you want SELinux support. */ /* #undef WITH_SELINUX */ -/* Define to 1 if your processor stores words with the most significant byte - first (like Motorola and SPARC, unlike Intel and VAX). */ +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most + significant byte first (like Motorola and SPARC, unlike Intel and VAX). */ #if defined __BIG_ENDIAN__ # define WORDS_BIGENDIAN 1 #elif ! defined __LITTLE_ENDIAN__ ==== //depot/projects/scottl-camlock/src/crypto/openssh/config.h.in#4 (text+ko) ==== @@ -80,9 +80,6 @@ /* Define if you want to specify the path to your lastlog file */ #undef CONF_LASTLOG_FILE -/* Define if you want to specify the path to your utmpx file */ -#undef CONF_UTMPX_FILE - /* Define if you want to specify the path to your utmp file */ #undef CONF_UTMP_FILE @@ -455,6 +452,9 @@ /* Define to 1 if you have the `getutxline' function. */ #undef HAVE_GETUTXLINE +/* Define to 1 if you have the `getutxuser' function. */ +#undef HAVE_GETUTXUSER + /* Define to 1 if you have the `get_default_context_with_level' function. */ #undef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL @@ -551,6 +551,9 @@ /* Define if system has libiaf that supports set_id */ #undef HAVE_LIBIAF +/* Define to 1 if you have the `network' library (-lnetwork). */ +#undef HAVE_LIBNETWORK + /* Define to 1 if you have the `nsl' library (-lnsl). */ #undef HAVE_LIBNSL @@ -804,6 +807,9 @@ /* Define to 1 if you have the `setutent' function. */ #undef HAVE_SETUTENT +/* Define to 1 if you have the `setutxdb' function. */ +#undef HAVE_SETUTXDB + /* Define to 1 if you have the `setutxent' function. */ #undef HAVE_SETUTXENT ==== //depot/projects/scottl-camlock/src/crypto/openssh/defines.h#6 (text+ko) ==== @@ -25,7 +25,7 @@ #ifndef _DEFINES_H #define _DEFINES_H -/* $Id: defines.h,v 1.159 2010/01/13 23:44:34 tim Exp $ */ +/* $Id: defines.h,v 1.160 2010/04/09 08:13:27 dtucker Exp $ */ /* Constants */ ==== //depot/projects/scottl-camlock/src/crypto/openssh/key.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $OpenBSD: key.c,v 1.85 2010/03/04 01:44:57 djm Exp $ */ +/* $OpenBSD: key.c,v 1.86 2010/03/15 19:40:02 stevesk Exp $ */ /* * read_bignum(): * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -802,6 +802,19 @@ } const char * +key_cert_type(const Key *k) +{ + switch (k->cert->type) { + case SSH2_CERT_TYPE_USER: + return "user"; + case SSH2_CERT_TYPE_HOST: + return "host"; + default: + return "unknown"; + } +} + +const char * key_ssh_name(const Key *k) { switch (k->type) { ==== //depot/projects/scottl-camlock/src/crypto/openssh/key.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $OpenBSD: key.h,v 1.28 2010/02/26 20:29:54 djm Exp $ */ +/* $OpenBSD: key.h,v 1.29 2010/03/15 19:40:02 stevesk Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. @@ -82,6 +82,7 @@ char *key_fingerprint(Key *, enum fp_type, enum fp_rep); u_char *key_fingerprint_raw(Key *, enum fp_type, u_int *); const char *key_type(const Key *); +const char *key_cert_type(const Key *); int key_write(const Key *, FILE *); int key_read(Key *, char **); u_int key_size(const Key *); ==== //depot/projects/scottl-camlock/src/crypto/openssh/loginrec.c#5 (text+ko) ==== @@ -146,7 +146,7 @@ */ #include "includes.h" -__RCSID("$FreeBSD: src/crypto/openssh/loginrec.c,v 1.20 2010/03/09 19:16:43 des Exp $"); +__RCSID("$FreeBSD: src/crypto/openssh/loginrec.c,v 1.21 2010/04/28 10:36:33 des Exp $"); #include #include @@ -510,6 +510,10 @@ #ifdef USE_LASTLOG return(lastlog_get_entry(li)); #else /* !USE_LASTLOG */ +#if defined(USE_UTMPX) && defined(HAVE_SETUTXDB) && \ + defined(UTXDB_LASTLOGIN) && defined(HAVE_GETUTXUSER) + return (utmpx_get_entry(li)); +#endif #if 1 return (utmpx_get_entry(li)); @@ -1614,7 +1618,8 @@ #endif /* HAVE_GETLASTLOGXBYNAME */ #endif /* USE_LASTLOG */ -#if 1 +#if defined(USE_UTMPX) && defined(HAVE_SETUTXDB) && \ + defined(UTXDB_LASTLOGIN) && defined(HAVE_GETUTXUSER) int utmpx_get_entry(struct logininfo *li) { @@ -1637,7 +1642,7 @@ endutxent(); return (1); } -#endif +#endif /* USE_UTMPX && HAVE_SETUTXDB && UTXDB_LASTLOGIN && HAVE_GETUTXUSER */ #ifdef USE_BTMP /* ==== //depot/projects/scottl-camlock/src/crypto/openssh/logintest.c#2 (text+ko) ==== @@ -264,7 +264,7 @@ printf("\tUSE_UTMP (UTMP_FILE=%s)\n", UTMP_FILE); #endif #ifdef USE_UTMPX - printf("\tUSE_UTMPX (UTMPX_FILE=%s)\n", UTMPX_FILE); + printf("\tUSE_UTMPX\n"); #endif #ifdef USE_WTMP printf("\tUSE_WTMP (WTMP_FILE=%s)\n", WTMP_FILE); ==== //depot/projects/scottl-camlock/src/crypto/openssh/openbsd-compat/bsd-arc4random.c#3 (text+ko) ==== @@ -84,7 +84,7 @@ } #endif /* !HAVE_ARC4RANDOM */ -#ifndef ARC4RANDOM_BUF +#ifndef HAVE_ARC4RANDOM_BUF void arc4random_buf(void *_buf, size_t n) { @@ -102,7 +102,7 @@ } #endif /* !HAVE_ARC4RANDOM_BUF */ -#ifndef ARC4RANDOM_UNIFORM +#ifndef HAVE_ARC4RANDOM_UNIFORM /* * Calculate a uniformly distributed random number less than upper_bound * avoiding "modulo bias". ==== //depot/projects/scottl-camlock/src/crypto/openssh/servconf.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $OpenBSD: servconf.c,v 1.204 2010/03/04 10:36:03 djm Exp $ */ +/* $OpenBSD: servconf.c,v 1.207 2010/03/25 23:38:28 djm Exp $ */ /* * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland * All rights reserved @@ -11,7 +11,7 @@ */ #include "includes.h" -__RCSID("$FreeBSD: src/crypto/openssh/servconf.c,v 1.53 2010/03/09 19:16:43 des Exp $"); +__RCSID("$FreeBSD: src/crypto/openssh/servconf.c,v 1.54 2010/04/28 10:36:33 des Exp $"); #include #include @@ -474,15 +474,14 @@ char * derelativise_path(const char *path) { - char *expanded, *ret, *cwd; + char *expanded, *ret, cwd[MAXPATHLEN]; expanded = tilde_expand_filename(path, getuid()); if (*expanded == '/') return expanded; - if ((cwd = getcwd(NULL, 0)) == NULL) + if (getcwd(cwd, sizeof(cwd)) == NULL) fatal("%s: getcwd: %s", __func__, strerror(errno)); xasprintf(&ret, "%s/%s", cwd, expanded); - xfree(cwd); xfree(expanded); return ret; } @@ -1227,7 +1226,17 @@ charptr = (opcode == sAuthorizedKeysFile) ? &options->authorized_keys_file : &options->authorized_keys_file2; - goto parse_filename; + arg = strdelim(&cp); + if (!arg || *arg == '\0') + fatal("%s line %d: missing file name.", + filename, linenum); + if (*activep && *charptr == NULL) { + *charptr = tilde_expand_filename(arg, getuid()); + /* increase optional counter */ + if (intptr != NULL) + *intptr = *intptr + 1; + } + break; case sClientAliveInterval: intptr = &options->client_alive_interval; ==== //depot/projects/scottl-camlock/src/crypto/openssh/session.c#5 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include "includes.h" -__RCSID("$FreeBSD: src/crypto/openssh/session.c,v 1.54 2010/03/09 19:16:43 des Exp $"); +__RCSID("$FreeBSD: src/crypto/openssh/session.c,v 1.55 2010/04/28 10:36:33 des Exp $"); #include #include @@ -1581,6 +1581,10 @@ } #endif /* HAVE_SETPCRED */ +#ifdef WITH_SELINUX + ssh_selinux_setup_exec_context(pw->pw_name); +#endif + if (options.chroot_directory != NULL && strcasecmp(options.chroot_directory, "none") != 0) { tmp = tilde_expand_filename(options.chroot_directory, @@ -1605,10 +1609,6 @@ if (getuid() != pw->pw_uid || geteuid() != pw->pw_uid) fatal("Failed to set uids to %u.", (u_int) pw->pw_uid); - -#ifdef WITH_SELINUX - ssh_selinux_setup_exec_context(pw->pw_name); -#endif } static void ==== //depot/projects/scottl-camlock/src/crypto/openssh/ssh-keygen.1#4 (text+ko) ==== @@ -1,5 +1,5 @@ -.\" $OpenBSD: ssh-keygen.1,v 1.88 2010/03/08 00:28:55 djm Exp $ -.\" $FreeBSD: src/crypto/openssh/ssh-keygen.1,v 1.5 2010/03/09 19:16:43 des Exp $ +.\" $OpenBSD: ssh-keygen.1,v 1.92 2010/03/13 23:38:13 jmc Exp $ +.\" $FreeBSD: src/crypto/openssh/ssh-keygen.1,v 1.6 2010/04/28 10:36:33 des Exp $ .\" .\" -*- nroff -*- .\" @@ -38,7 +38,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd March 8 2010 +.Dd March 13 2010 .Dt SSH-KEYGEN 1 .Os .Sh NAME @@ -308,8 +308,15 @@ section for details. The constraints that are valid for user certificates are: .Bl -tag -width Ds -.It Ic no-x11-forwarding -Disable X11 forwarding (permitted by default). +.It Ic clear +Clear all enabled permissions. +This is useful for clearing the default set of permissions so permissions may +be added individually. +.It Ic force-command Ns = Ns Ar command +Forces the execution of +.Ar command +instead of any shell or command specified by the user when +the certificate is used for authentication. .It Ic no-agent-forwarding Disable .Xr ssh-agent 1 @@ -324,12 +331,8 @@ by .Xr sshd 8 (permitted by default). -.It Ic clear -Clear all enabled permissions. -This is useful for clearing the default set of permissions so permissions may -be added individually. -.It Ic permit-x11-forwarding -Allows X11 forwarding. +.It Ic no-x11-forwarding +Disable X11 forwarding (permitted by default). .It Ic permit-agent-forwarding Allows .Xr ssh-agent 1 @@ -343,14 +346,10 @@ .Pa ~/.ssh/rc by .Xr sshd 8 . -.It Ic force-command=command -Forces the execution of -.Ar command -instead of any shell or command specified by the user when -the certificate is used for authentication. -.It Ic source-address=address_list -Restrict the source addresses from which the certificate is considered valid -from. +.It Ic permit-x11-forwarding +Allows X11 forwarding. +.It Ic source-address Ns = Ns Ar address_list +Restrict the source addresses from which the certificate is considered valid. The .Ar address_list is a comma-separated list of one or more address/netmask pairs in CIDR @@ -415,7 +414,7 @@ of a minus sign followed by a relative time in the format described in the .Sx TIME FORMATS section of -.Xr ssh_config 5 . +.Xr sshd_config 5 . The end time may be specified as a YYYYMMDD date, a YYYYMMDDHHMMSS time or a relative time starting with a plus character. .Pp @@ -520,7 +519,7 @@ .Dl $ ssh-keygen -s /path/to/ca_key -I key_id /path/to/user_key.pub .Pp The resultant certificate will be placed in -.Pa /path/to/user_key_cert.pub . +.Pa /path/to/user_key-cert.pub . A host certificate requires the .Fl h option: @@ -528,7 +527,7 @@ .Dl $ ssh-keygen -s /path/to/ca_key -I key_id -h /path/to/host_key.pub .Pp The host certificate will be output to -.Pa /path/to/host_key_cert.pub . +.Pa /path/to/host_key-cert.pub . In both cases, .Ar key_id is a "key identifier" that is logged by the server when the certificate @@ -540,7 +539,7 @@ To generate a certificate for a specified set of principals: .Pp .Dl $ ssh-keygen -s ca_key -I key_id -n user1,user2 user_key.pub -.Dl $ ssh-keygen -s ca_key -I key_id -h -n host.domain user_key.pub +.Dl "$ ssh-keygen -s ca_key -I key_id -h -n host.domain user_key.pub" .Pp Additional limitations on the validity and use of user certificates may be specified through certificate constraints. ==== //depot/projects/scottl-camlock/src/crypto/openssh/ssh-keygen.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-keygen.c,v 1.184 2010/03/07 22:16:01 djm Exp $ */ +/* $OpenBSD: ssh-keygen.c,v 1.185 2010/03/15 19:40:02 stevesk Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1994 Tatu Ylonen , Espoo, Finland @@ -1393,7 +1393,8 @@ SSH_FP_MD5, SSH_FP_HEX); printf("%s:\n", identity_file); - printf(" %s certificate %s\n", key_type(key), key_fp); + printf(" %s %s certificate %s\n", key_type(key), + key_cert_type(key), key_fp); printf(" Signed by %s CA %s\n", key_type(key->cert->signature_key), ca_fp); printf(" Key ID \"%s\"\n", key->cert->key_id); ==== //depot/projects/scottl-camlock/src/crypto/openssh/ssh-pkcs11-helper.c#2 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat May 1 10:49:37 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 941F11065678; Sat, 1 May 2010 10:49:37 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 58C861065674 for ; Sat, 1 May 2010 10:49:37 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 465968FC0C for ; Sat, 1 May 2010 10:49:37 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o41Anbjj082604 for ; Sat, 1 May 2010 10:49:37 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o41Anb8n082602 for perforce@freebsd.org; Sat, 1 May 2010 10:49:37 GMT (envelope-from mav@freebsd.org) Date: Sat, 1 May 2010 10:49:37 GMT Message-Id: <201005011049.o41Anb8n082602@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177549 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 May 2010 10:49:37 -0000 http://p4web.freebsd.org/@@177549?ac=10 Change 177549 by mav@mav_mavtest on 2010/05/01 10:49:14 Make SATA XPT negotiate some SATA-specific capabilities between the device and the SIM. Affected files ... .. //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.c#40 edit .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#87 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam_ccb.h#41 edit .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#109 edit .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.h#39 edit Differences ... ==== //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.c#40 (text+ko) ==== @@ -123,7 +123,7 @@ }; #ifndef MINIMALISTIC -static const char scsicmd_opts[] = "a:c:i:o:r"; +static const char scsicmd_opts[] = "a:c:dfi:o:r"; static const char readdefect_opts[] = "f:GP"; static const char negotiate_opts[] = "acD:M:O:qR:T:UW:"; #endif @@ -2184,6 +2184,8 @@ int c, data_bytes = 0; int cdb_len = 0; int atacmd_len = 0; + int dmacmd = 0; + int fpdmacmd = 0; int need_res = 0; char *datastr = NULL, *tstr, *resstr = NULL; int error = 0; @@ -2246,6 +2248,12 @@ */ optind += hook.got; break; + case 'd': + dmacmd = 1; + break; + case 'f': + fpdmacmd = 1; + break; case 'i': if (arglist & CAM_ARG_CMD_OUT) { warnx("command must either be " @@ -2422,6 +2430,10 @@ bcopy(atacmd, &ccb->ataio.cmd.command, atacmd_len); if (need_res) ccb->ataio.cmd.flags |= CAM_ATAIO_NEEDRESULT; + if (dmacmd) + ccb->ataio.cmd.flags |= CAM_ATAIO_DMA; + if (fpdmacmd) + ccb->ataio.cmd.flags |= CAM_ATAIO_FPDMA; cam_fill_ataio(&ccb->ataio, /*retries*/ retry_count, @@ -2843,6 +2855,10 @@ fprintf(stdout, "%sNumber of tags: %d\n", pathstr, sata->tags); } + if ((sata->valid & CTS_SATA_VALID_CAPS) != 0) { + fprintf(stdout, "%sSATA capabilities: %08x\n", pathstr, + sata->caps); + } } if (cts->protocol == PROTO_SCSI) { struct ccb_trans_settings_scsi *scsi= ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#87 (text+ko) ==== @@ -88,6 +88,9 @@ PROBE_IDENTIFY, PROBE_SPINUP, PROBE_SETMODE, + PROBE_SETPM, + PROBE_SETAPST, + PROBE_SETDMAAA, PROBE_SET_MULTI, PROBE_INQUIRY, PROBE_FULL_INQUIRY, @@ -101,6 +104,9 @@ "PROBE_IDENTIFY", "PROBE_SPINUP", "PROBE_SETMODE", + "PROBE_SETPM", + "PROBE_SETAPST", + "PROBE_SETDMAAA", "PROBE_SET_MULTI", "PROBE_INQUIRY", "PROBE_FULL_INQUIRY", @@ -132,6 +138,7 @@ uint32_t pm_prv; int restart; int spinup; + u_int caps; struct cam_periph *periph; } probe_softc; @@ -393,6 +400,45 @@ ata_28bit_cmd(ataio, ATA_SETFEATURES, ATA_SF_SETXFER, 0, mode); break; } + case PROBE_SETPM: + cam_fill_ataio(ataio, + 1, + probedone, + CAM_DIR_NONE, + 0, + NULL, + 0, + 30*1000); + ata_28bit_cmd(ataio, ATA_SETFEATURES, + (softc->caps & CTS_SATA_CAPS_H_PMREQ) ? 0x10 : 0x90, + 0, 0x03); + break; + case PROBE_SETAPST: + cam_fill_ataio(ataio, + 1, + probedone, + CAM_DIR_NONE, + 0, + NULL, + 0, + 30*1000); + ata_28bit_cmd(ataio, ATA_SETFEATURES, + (softc->caps & CTS_SATA_CAPS_H_APST) ? 0x10 : 0x90, + 0, 0x07); + break; + case PROBE_SETDMAAA: + cam_fill_ataio(ataio, + 1, + probedone, + CAM_DIR_NONE, + 0, + NULL, + 0, + 30*1000); + ata_28bit_cmd(ataio, ATA_SETFEATURES, + (softc->caps & CTS_SATA_CAPS_H_DMAAA) ? 0x10 : 0x90, + 0, 0x02); + break; case PROBE_SET_MULTI: { u_int sectors, bytecount; @@ -879,6 +925,69 @@ xpt_schedule(periph, priority); return; case PROBE_SETMODE: + { + u_int caps = 0; + + if (path->device->transport != XPORT_SATA) + goto notsata; + /* Set supported bits. */ + bzero(&cts, sizeof(cts)); + xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NONE); + cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS; + cts.type = CTS_TYPE_CURRENT_SETTINGS; + xpt_action((union ccb *)&cts); + if (cts.xport_specific.sata.valid & CTS_SATA_VALID_CAPS) + caps = cts.xport_specific.sata.caps & CTS_SATA_CAPS_H; + if (ident_buf->satacapabilities != 0xffff) { + if (ident_buf->satacapabilities & ATA_SUPPORT_IFPWRMNGTRCV) + caps |= CTS_SATA_CAPS_D_PMREQ; + if (ident_buf->satacapabilities & ATA_SUPPORT_HAPST) + caps |= CTS_SATA_CAPS_D_APST; + } + /* Mask unwanted bits. */ + bzero(&cts, sizeof(cts)); + xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NONE); + cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS; + cts.type = CTS_TYPE_USER_SETTINGS; + xpt_action((union ccb *)&cts); + if (cts.xport_specific.sata.valid & CTS_SATA_VALID_CAPS) + caps &= cts.xport_specific.sata.caps; + /* Store result to SIM. */ + bzero(&cts, sizeof(cts)); + xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NONE); + cts.ccb_h.func_code = XPT_SET_TRAN_SETTINGS; + cts.type = CTS_TYPE_CURRENT_SETTINGS; + cts.xport_specific.sata.caps = caps; + cts.xport_specific.sata.valid = CTS_SATA_VALID_CAPS; + xpt_action((union ccb *)&cts); + softc->caps = caps; + if (ident_buf->satasupport & ATA_SUPPORT_IFPWRMNGT) { + PROBE_SET_ACTION(softc, PROBE_SETPM); + xpt_release_ccb(done_ccb); + xpt_schedule(periph, priority); + return; + } + /* FALLTHROUGH */ + } + case PROBE_SETPM: + if (ident_buf->satacapabilities != 0xffff && + ident_buf->satacapabilities & ATA_SUPPORT_DAPST) { + PROBE_SET_ACTION(softc, PROBE_SETAPST); + xpt_release_ccb(done_ccb); + xpt_schedule(periph, priority); + return; + } + /* FALLTHROUGH */ + case PROBE_SETAPST: + if (ident_buf->satasupport & ATA_SUPPORT_AUTOACTIVATE) { + PROBE_SET_ACTION(softc, PROBE_SETDMAAA); + xpt_release_ccb(done_ccb); + xpt_schedule(periph, priority); + return; + } + /* FALLTHROUGH */ + case PROBE_SETDMAAA: +notsata: if (path->device->protocol == PROTO_ATA) { PROBE_SET_ACTION(softc, PROBE_SET_MULTI); } else { ==== //depot/projects/scottl-camlock/src/sys/cam/cam_ccb.h#41 (text+ko) ==== @@ -837,12 +837,21 @@ #define CTS_SATA_VALID_PM 0x08 #define CTS_SATA_VALID_TAGS 0x10 #define CTS_SATA_VALID_ATAPI 0x20 +#define CTS_SATA_VALID_CAPS 0x40 int mode; /* Legacy PATA mode */ u_int bytecount; /* Length of PIO transaction */ int revision; /* SATA revision */ u_int pm_present; /* PM is present (XPT->SIM) */ u_int tags; /* Number of allowed tags */ u_int atapi; /* Length of ATAPI CDB */ + u_int caps; /* Device and host SATA caps. */ +#define CTS_SATA_CAPS_H 0x0000ffff +#define CTS_SATA_CAPS_H_PMREQ 0x00000001 +#define CTS_SATA_CAPS_H_APST 0x00000002 +#define CTS_SATA_CAPS_H_DMAAA 0x00000010 /* Auto-activation */ +#define CTS_SATA_CAPS_D 0xffff0000 +#define CTS_SATA_CAPS_D_PMREQ 0x00010000 +#define CTS_SATA_CAPS_D_APST 0x00020000 }; /* Get/Set transfer rate/width/disconnection/tag queueing settings */ ==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#109 (text+ko) ==== @@ -860,7 +860,14 @@ ch->user[i].mode = 0; ch->user[i].bytecount = 8192; ch->user[i].tags = ch->numslots; + ch->user[i].caps = 0; ch->curr[i] = ch->user[i]; + if (ch->pm_level) { + ch->user[i].caps = CTS_SATA_CAPS_H_PMREQ | + CTS_SATA_CAPS_H_APST | + CTS_SATA_CAPS_D_PMREQ | CTS_SATA_CAPS_D_APST; + } + ch->user[i].caps |= CTS_SATA_CAPS_H_DMAAA; } rid = ch->unit; if (!(ch->r_mem = bus_alloc_resource_any(dev, SYS_RES_MEMORY, @@ -2464,6 +2471,8 @@ ch->pm_present = cts->xport_specific.sata.pm_present; if (cts->xport_specific.sata.valid & CTS_SATA_VALID_ATAPI) d->atapi = cts->xport_specific.sata.atapi; + if (cts->xport_specific.sata.valid & CTS_SATA_VALID_CAPS) + d->caps = cts->xport_specific.sata.caps; ccb->ccb_h.status = CAM_REQ_CMP; break; } @@ -2496,9 +2505,23 @@ cts->xport_specific.sata.valid |= CTS_SATA_VALID_REVISION; } + cts->xport_specific.sata.caps = d->caps & CTS_SATA_CAPS_D; + if (ch->pm_level) { + if (ch->caps & (AHCI_CAP_PSC | AHCI_CAP_SSC)) + cts->xport_specific.sata.caps |= CTS_SATA_CAPS_H_PMREQ; + if (ch->caps2 & AHCI_CAP2_APST) + cts->xport_specific.sata.caps |= CTS_SATA_CAPS_H_APST; + if (ch->caps & AHCI_CAP_SNCQ) + cts->xport_specific.sata.caps |= CTS_SATA_CAPS_H_DMAAA; + cts->xport_specific.sata.caps &= + ch->user[ccb->ccb_h.target_id].caps; + } + cts->xport_specific.sata.valid |= CTS_SATA_VALID_CAPS; } else { cts->xport_specific.sata.revision = d->revision; cts->xport_specific.sata.valid |= CTS_SATA_VALID_REVISION; + cts->xport_specific.sata.caps = d->caps; + cts->xport_specific.sata.valid |= CTS_SATA_VALID_CAPS; } cts->xport_specific.sata.mode = d->mode; cts->xport_specific.sata.valid |= CTS_SATA_VALID_MODE; ==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.h#39 (text+ko) ==== @@ -372,6 +372,7 @@ u_int bytecount; u_int atapi; u_int tags; + u_int caps; }; /* structure describing an ATA channel */ From owner-p4-projects@FreeBSD.ORG Sat May 1 10:54:43 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DBDA61065672; Sat, 1 May 2010 10:54:42 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9F599106564A for ; Sat, 1 May 2010 10:54:42 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8C3168FC08 for ; Sat, 1 May 2010 10:54:42 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o41AsgKG082946 for ; Sat, 1 May 2010 10:54:42 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o41Asgrh082944 for perforce@freebsd.org; Sat, 1 May 2010 10:54:42 GMT (envelope-from mav@freebsd.org) Date: Sat, 1 May 2010 10:54:42 GMT Message-Id: <201005011054.o41Asgrh082944@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177550 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 May 2010 10:54:43 -0000 http://p4web.freebsd.org/@@177550?ac=10 Change 177550 by mav@mav_mavtest on 2010/05/01 10:54:04 IFC Affected files ... .. //depot/projects/scottl-camlock/src/contrib/telnet/telnet/commands.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/telnet/telnet/externs.h#4 integrate .. //depot/projects/scottl-camlock/src/contrib/telnet/telnet/network.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/telnet/telnet/sys_bsd.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/telnet/telnet/telnet.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/telnet/telnet/terminal.c#2 integrate .. //depot/projects/scottl-camlock/src/sbin/tunefs/tunefs.c#6 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/msk.4#8 integrate .. //depot/projects/scottl-camlock/src/sys/compat/x86bios/x86bios.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/e1000phy.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/miidevs#20 integrate .. //depot/projects/scottl-camlock/src/sys/dev/msk/if_msk.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/dev/msk/if_mskreg.h#13 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_taskqueue.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/pmap.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/booke/pmap.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/sys/_task.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/sys/taskqueue.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_contig.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_fault.c#33 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_object.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_page.h#16 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_pageout.c#22 integrate .. //depot/projects/scottl-camlock/src/tools/tools/nanobsd/nanobsd.sh#8 integrate .. //depot/projects/scottl-camlock/src/usr.bin/script/script.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/config/main.c#5 integrate Differences ... ==== //depot/projects/scottl-camlock/src/contrib/telnet/telnet/commands.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif #include -__FBSDID("$FreeBSD: src/contrib/telnet/telnet/commands.c,v 1.35 2005/02/28 12:46:52 tobez Exp $"); +__FBSDID("$FreeBSD: src/contrib/telnet/telnet/commands.c,v 1.36 2010/04/30 19:52:35 jilles Exp $"); #include #include @@ -2491,8 +2491,7 @@ env_export("USER"); } (void) call(status, "status", "notmuch", 0); - if (setjmp(peerdied) == 0) - telnet(user); + telnet(user); (void) NetClose(net); ExitString("Connection closed by foreign host.\n",1); /*NOTREACHED*/ ==== //depot/projects/scottl-camlock/src/contrib/telnet/telnet/externs.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)externs.h 8.3 (Berkeley) 5/30/95 - * $FreeBSD: src/contrib/telnet/telnet/externs.h,v 1.12 2009/11/28 11:57:25 ed Exp $ + * $FreeBSD: src/contrib/telnet/telnet/externs.h,v 1.13 2010/04/30 19:52:35 jilles Exp $ */ #ifndef BSD @@ -233,7 +233,6 @@ SetNetTrace(char *); /* Function to change where debugging goes */ extern jmp_buf - peerdied, toplevel; /* For error conditions. */ extern void ==== //depot/projects/scottl-camlock/src/contrib/telnet/telnet/network.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif #include -__FBSDID("$FreeBSD: src/contrib/telnet/telnet/network.c,v 1.7 2003/05/04 02:54:48 obrien Exp $"); +__FBSDID("$FreeBSD: src/contrib/telnet/telnet/network.c,v 1.8 2010/04/30 19:52:35 jilles Exp $"); #include #include @@ -158,7 +158,7 @@ perror(hostname); (void)NetClose(net); ring_clear_mark(&netoring); - longjmp(peerdied, -1); + ExitString("Connection closed by foreign host.\n", 1); /*NOTREACHED*/ } n = 0; ==== //depot/projects/scottl-camlock/src/contrib/telnet/telnet/sys_bsd.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif #include -__FBSDID("$FreeBSD: src/contrib/telnet/telnet/sys_bsd.c,v 1.12 2003/05/04 02:54:48 obrien Exp $"); +__FBSDID("$FreeBSD: src/contrib/telnet/telnet/sys_bsd.c,v 1.13 2010/04/30 19:52:35 jilles Exp $"); /* * The following routines try to encapsulate what is system dependent @@ -809,14 +809,6 @@ */ /* ARGSUSED */ -static SIG_FUNC_RET -deadpeer(int sig __unused) -{ - setcommandmode(); - longjmp(peerdied, -1); -} - -/* ARGSUSED */ SIG_FUNC_RET intr(int sig __unused) { @@ -884,7 +876,7 @@ { (void) signal(SIGINT, intr); (void) signal(SIGQUIT, intr2); - (void) signal(SIGPIPE, deadpeer); + (void) signal(SIGPIPE, SIG_IGN); #ifdef SIGWINCH (void) signal(SIGWINCH, sendwin); #endif ==== //depot/projects/scottl-camlock/src/contrib/telnet/telnet/telnet.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif #include -__FBSDID("$FreeBSD: src/contrib/telnet/telnet/telnet.c,v 1.16 2005/03/28 14:45:12 nectar Exp $"); +__FBSDID("$FreeBSD: src/contrib/telnet/telnet/telnet.c,v 1.17 2010/04/30 19:52:35 jilles Exp $"); #include @@ -146,7 +146,6 @@ #endif jmp_buf toplevel; -jmp_buf peerdied; int flushline; int linemode; ==== //depot/projects/scottl-camlock/src/contrib/telnet/telnet/terminal.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif #include -__FBSDID("$FreeBSD: src/contrib/telnet/telnet/terminal.c,v 1.7 2003/05/04 02:54:48 obrien Exp $"); +__FBSDID("$FreeBSD: src/contrib/telnet/telnet/terminal.c,v 1.8 2010/04/30 19:52:35 jilles Exp $"); #include #include @@ -111,7 +111,8 @@ } /* - * Send as much data as possible to the terminal. + * Send as much data as possible to the terminal, else exits if + * it encounters a permanent failure when writing to the tty. * * Return value: * -1: No useful work done, data waiting to go out. @@ -152,8 +153,19 @@ } ring_consumed(&ttyoring, n); } - if (n < 0) + if (n < 0) { + if (errno == EAGAIN || errno == EINTR) { + return -1; + } else { + ring_consumed(&ttyoring, ring_full_count(&ttyoring)); + setconnmode(0); + setcommandmode(); + NetClose(net); + fprintf(stderr, "Write error on local output.\n"); + exit(1); + } return -1; + } if (n == n0) { if (n0) return -1; ==== //depot/projects/scottl-camlock/src/sbin/tunefs/tunefs.c#6 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/tunefs/tunefs.c,v 1.47 2010/04/30 04:21:22 jeff Exp $"); +__FBSDID("$FreeBSD: src/sbin/tunefs/tunefs.c,v 1.48 2010/05/01 09:05:06 edwin Exp $"); /* * tunefs: change layout parameters to an existing file system. @@ -1007,10 +1007,11 @@ void usage(void) { - fprintf(stderr, "%s\n%s\n%s\n%s\n", + fprintf(stderr, "%s\n%s\n%s\n%s\n%s\n", "usage: tunefs [-A] [-a enable | disable] [-e maxbpg] [-f avgfilesize]", -" [-J enable | disable ] [-L volname] [-l enable | disable]", -" [-m minfree] [-N enable | disable] [-n enable | disable]", +" [-J enable | disable] [-j enable | disable]", +" [-L volname] [-l enable | disable] [-m minfree]", +" [-N enable | disable] [-n enable | disable]", " [-o space | time] [-p] [-s avgfpdir] special | filesystem"); exit(2); } ==== //depot/projects/scottl-camlock/src/share/man/man4/msk.4#8 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/msk.4,v 1.13 2010/03/01 23:56:51 yongari Exp $ +.\" $FreeBSD: src/share/man/man4/msk.4,v 1.14 2010/04/30 19:05:01 yongari Exp $ .\" -.Dd March 1, 2010 +.Dd April 30, 2010 .Dt MSK 4 .Os .Sh NAME @@ -208,6 +208,8 @@ .It Marvell Yukon 88E8058 Gigabit Ethernet .It +Marvell Yukon 88E8059 Gigabit Ethernet +.It Marvell Yukon 88E8070 Gigabit Ethernet .It Marvell Yukon 88E8071 Gigabit Ethernet ==== //depot/projects/scottl-camlock/src/sys/compat/x86bios/x86bios.c#8 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/x86bios/x86bios.c,v 1.15 2010/03/25 17:14:47 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/x86bios/x86bios.c,v 1.17 2010/05/01 01:05:07 jkim Exp $"); #include "opt_x86bios.h" @@ -47,11 +47,15 @@ #include #include -#include +#include #include #include +#if defined(__amd64__) || defined(__i386__) +#define X86BIOS_NATIVE_ARCH +#endif + #define X86BIOS_PAGE_SIZE 0x00001000 /* 4K */ #define X86BIOS_IVT_SIZE 0x00000500 /* 1K + 256 (BDA) */ @@ -236,27 +240,49 @@ if (port >= 0x80 && port < 0x88) /* POST status register */ return (0); - return (inb(port)); + return (iodev_read_1(port)); } static uint16_t x86bios_emu_inw(struct x86emu *emu, uint16_t port) { + uint16_t val; if (port >= 0x80 && port < 0x88) /* POST status register */ return (0); - return (inw(port)); +#ifndef X86BIOS_NATIVE_ARCH + if ((port & 1) != 0) { + val = iodev_read_1(port); + val |= iodev_read_1(port + 1) << 8; + } else +#endif + val = iodev_read_2(port); + + return (val); } static uint32_t x86bios_emu_inl(struct x86emu *emu, uint16_t port) { + uint32_t val; if (port >= 0x80 && port < 0x88) /* POST status register */ return (0); - return (inl(port)); +#ifndef X86BIOS_NATIVE_ARCH + if ((port & 1) != 0) { + val = iodev_read_1(port); + val |= iodev_read_2(port + 1) << 8; + val |= iodev_read_1(port + 3) << 24; + } else if ((port & 2) != 0) { + val = iodev_read_2(port); + val |= iodev_read_2(port + 2) << 16; + } else +#endif + val = iodev_read_4(port); + + return (val); } static void @@ -268,7 +294,7 @@ if (port >= 0x80 && port < 0x88) /* POST status register */ return; - outb(port, val); + iodev_write_1(port, val); } static void @@ -278,7 +304,13 @@ if (port >= 0x80 && port < 0x88) /* POST status register */ return; - outw(port, val); +#ifndef X86BIOS_NATIVE_ARCH + if ((port & 1) != 0) { + iodev_write_1(port, val); + iodev_write_1(port + 1, val >> 8); + } else +#endif + iodev_write_2(port, val); } static void @@ -288,7 +320,17 @@ if (port >= 0x80 && port < 0x88) /* POST status register */ return; - outl(port, val); +#ifndef X86BIOS_NATIVE_ARCH + if ((port & 1) != 0) { + iodev_write_1(port, val); + iodev_write_2(port + 1, val >> 8); + iodev_write_1(port + 3, val >> 24); + } else if ((port & 2) != 0) { + iodev_write_2(port, val); + iodev_write_2(port + 2, val >> 16); + } else +#endif + iodev_write_4(port, val); } static void @@ -484,45 +526,53 @@ return (1); } -#if defined(__amd64__) || (defined(__i386__) && !defined(PC98)) -#define PROBE_EBDA 1 +static __inline void +x86bios_unmap_mem(void) +{ + + if (x86bios_ivt != NULL) +#ifdef X86BIOS_NATIVE_ARCH + pmap_unmapdev((vm_offset_t)x86bios_ivt, X86BIOS_IVT_SIZE); #else -#define PROBE_EBDA 0 + free(x86bios_ivt, M_DEVBUF); #endif + if (x86bios_rom != NULL) + pmap_unmapdev((vm_offset_t)x86bios_rom, X86BIOS_ROM_SIZE); + if (x86bios_seg != NULL) + contigfree(x86bios_seg, X86BIOS_SEG_SIZE, M_DEVBUF); +} static __inline int x86bios_map_mem(void) { +#ifdef X86BIOS_NATIVE_ARCH x86bios_ivt = pmap_mapbios(X86BIOS_IVT_BASE, X86BIOS_IVT_SIZE); - if (x86bios_ivt == NULL) - return (1); -#if PROBE_EBDA +#ifndef PC98 /* Probe EBDA via BDA. */ - x86bios_rom_phys = *(uint16_t *)((vm_offset_t)x86bios_ivt + 0x40e); - x86bios_rom_phys = le16toh(x86bios_rom_phys) << 4; + x86bios_rom_phys = *(uint16_t *)((caddr_t)x86bios_ivt + 0x40e); + x86bios_rom_phys = x86bios_rom_phys << 4; if (x86bios_rom_phys != 0 && x86bios_rom_phys < X86BIOS_ROM_BASE && X86BIOS_ROM_BASE - x86bios_rom_phys <= 128 * 1024) x86bios_rom_phys = rounddown(x86bios_rom_phys, X86BIOS_PAGE_SIZE); else #endif +#else + x86bios_ivt = malloc(X86BIOS_IVT_SIZE, M_DEVBUF, M_ZERO | M_WAITOK); +#endif + x86bios_rom_phys = X86BIOS_ROM_BASE; x86bios_rom = pmap_mapdev(x86bios_rom_phys, X86BIOS_ROM_SIZE); - if (x86bios_rom == NULL) { - pmap_unmapdev((vm_offset_t)x86bios_ivt, X86BIOS_IVT_SIZE); - return (1); - } -#if PROBE_EBDA + if (x86bios_rom == NULL) + goto fail; +#if defined(X86BIOS_NATIVE_ARCH) && !defined(PC98) /* Change attribute for EBDA. */ if (x86bios_rom_phys < X86BIOS_ROM_BASE && pmap_change_attr((vm_offset_t)x86bios_rom, - X86BIOS_ROM_BASE - x86bios_rom_phys, PAT_WRITE_BACK) != 0) { - pmap_unmapdev((vm_offset_t)x86bios_ivt, X86BIOS_IVT_SIZE); - pmap_unmapdev((vm_offset_t)x86bios_rom, X86BIOS_ROM_SIZE); - return (1); - } + X86BIOS_ROM_BASE - x86bios_rom_phys, PAT_WRITE_BACK) != 0) + goto fail; #endif x86bios_seg = contigmalloc(X86BIOS_SEG_SIZE, M_DEVBUF, M_WAITOK, @@ -537,12 +587,10 @@ (uint32_t)x86bios_seg_phys, X86BIOS_SEG_SIZE + (uint32_t)x86bios_seg_phys - 1, x86bios_seg); -#if PROBE_EBDA if (x86bios_rom_phys < X86BIOS_ROM_BASE) printf("x86bios: EBDA 0x%06x-0x%06x at %p\n", (uint32_t)x86bios_rom_phys, X86BIOS_ROM_BASE - 1, x86bios_rom); -#endif printf("x86bios: ROM 0x%06x-0x%06x at %p\n", X86BIOS_ROM_BASE, X86BIOS_MEM_SIZE - X86BIOS_SEG_SIZE - 1, (void *)((vm_offset_t)x86bios_rom + X86BIOS_ROM_BASE - @@ -550,29 +598,23 @@ } return (0); -} -#undef PROBE_EBDA +fail: + x86bios_unmap_mem(); -static __inline void -x86bios_unmap_mem(void) -{ - - pmap_unmapdev((vm_offset_t)x86bios_ivt, X86BIOS_IVT_SIZE); - pmap_unmapdev((vm_offset_t)x86bios_rom, X86BIOS_ROM_SIZE); - contigfree(x86bios_seg, X86BIOS_SEG_SIZE, M_DEVBUF); + return (1); } -static void -x86bios_init(void *arg __unused) +static int +x86bios_init(void) { int i; + if (x86bios_map_mem() != 0) + return (ENOMEM); + mtx_init(&x86bios_lock, "x86bios lock", NULL, MTX_SPIN); - if (x86bios_map_mem() != 0) - return; - x86bios_map = malloc(sizeof(*x86bios_map) * X86BIOS_PAGES, M_DEVBUF, M_WAITOK | M_ZERO); x86bios_set_pages((vm_offset_t)x86bios_ivt, X86BIOS_IVT_BASE, @@ -600,10 +642,12 @@ for (i = 0; i < 256; i++) x86bios_emu._x86emu_intrTab[i] = x86bios_emu_get_intr; + + return (0); } -static void -x86bios_uninit(void *arg __unused) +static int +x86bios_uninit(void) { vm_offset_t *map = x86bios_map; @@ -618,6 +662,8 @@ x86bios_unmap_mem(); mtx_destroy(&x86bios_lock); + + return (0); } static int @@ -626,16 +672,12 @@ switch (type) { case MOD_LOAD: - x86bios_init(NULL); - break; + return (x86bios_init()); case MOD_UNLOAD: - x86bios_uninit(NULL); - break; + return (x86bios_uninit()); default: return (ENOTSUP); } - - return (0); } static moduledata_t x86bios_mod = { ==== //depot/projects/scottl-camlock/src/sys/dev/mii/e1000phy.c#14 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/mii/e1000phy.c,v 1.35 2010/03/03 17:56:52 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mii/e1000phy.c,v 1.36 2010/04/30 19:01:55 yongari Exp $"); /* * driver for the Marvell 88E1000 series external 1000/100/10-BT PHY. @@ -112,6 +112,7 @@ MII_PHY_DESC(MARVELL, E1116R), MII_PHY_DESC(MARVELL, E1118), MII_PHY_DESC(MARVELL, E3016), + MII_PHY_DESC(MARVELL, PHYG65G), MII_PHY_DESC(xxMARVELL, E1000), MII_PHY_DESC(xxMARVELL, E1011), MII_PHY_DESC(xxMARVELL, E1000_3), @@ -230,6 +231,7 @@ case MII_MODEL_MARVELL_E1116: case MII_MODEL_MARVELL_E1118: case MII_MODEL_MARVELL_E1149: + case MII_MODEL_MARVELL_PHYG65G: /* Disable energy detect mode. */ reg &= ~E1000_SCR_EN_DETECT_MASK; reg |= E1000_SCR_AUTO_X_MODE; ==== //depot/projects/scottl-camlock/src/sys/dev/mii/miidevs#20 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/mii/miidevs,v 1.71 2010/04/13 20:07:52 yongari Exp $ +$FreeBSD: src/sys/dev/mii/miidevs,v 1.72 2010/04/30 19:01:55 yongari Exp $ /*$NetBSD: miidevs,v 1.6 1999/05/14 11:37:30 drochner Exp $*/ /*- @@ -247,6 +247,7 @@ model MARVELL E1116R 0x0024 Marvell 88E1116R Gigabit PHY model MARVELL E1118 0x0022 Marvell 88E1118 Gigabit PHY model MARVELL E3016 0x0026 Marvell 88E3016 10/100 Fast Ethernet PHY +model MARVELL PHYG65G 0x0027 Marvell PHYG65G Gigabit PHY model xxMARVELL E1000 0x0005 Marvell 88E1000 Gigabit PHY model xxMARVELL E1011 0x0002 Marvell 88E1011 Gigabit PHY model xxMARVELL E1000_3 0x0003 Marvell 88E1000 Gigabit PHY ==== //depot/projects/scottl-camlock/src/sys/dev/msk/if_msk.c#22 (text+ko) ==== @@ -99,7 +99,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/msk/if_msk.c,v 1.94 2010/04/30 00:34:00 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/msk/if_msk.c,v 1.96 2010/04/30 18:58:55 yongari Exp $"); #include #include @@ -223,6 +223,8 @@ "Marvell Yukon 88E8072 Gigabit Ethernet" }, { VENDORID_MARVELL, DEVICEID_MRVL_4380, "Marvell Yukon 88E8057 Gigabit Ethernet" }, + { VENDORID_MARVELL, DEVICEID_MRVL_4381, + "Marvell Yukon 88E8059 Gigabit Ethernet" }, { VENDORID_DLINK, DEVICEID_DLINK_DGE550SX, "D-Link 550SX Gigabit Ethernet" }, { VENDORID_DLINK, DEVICEID_DLINK_DGE560SX, @@ -239,7 +241,9 @@ "Yukon FE", "Yukon FE+", "Yukon Supreme", - "Yukon Ultra 2" + "Yukon Ultra 2", + "Yukon Unknown", + "Yukon Optima", }; static int mskc_probe(device_t); @@ -1229,6 +1233,7 @@ case CHIP_ID_YUKON_EX: case CHIP_ID_YUKON_FE_P: case CHIP_ID_YUKON_UL_2: + case CHIP_ID_YUKON_OPT: CSR_WRITE_2(sc, B0_CTST, Y2_HW_WOL_OFF); /* Enable all clocks. */ @@ -1372,6 +1377,10 @@ GMC_BYP_MACSECRX_ON | GMC_BYP_MACSECTX_ON | GMC_BYP_RETR_ON); } + if (sc->msk_hw_id == CHIP_ID_YUKON_OPT && sc->msk_hw_rev == 0) { + /* Disable PCIe PHY powerdown(reg 0x80, bit7). */ + CSR_WRITE_4(sc, Y2_PEX_PHY_DATA, (0x0080 << 16) | 0x0080); + } CSR_WRITE_1(sc, B2_TST_CTRL1, TST_CFG_WRITE_OFF); /* LED On. */ @@ -1705,8 +1714,9 @@ sc->msk_hw_rev = (CSR_READ_1(sc, B2_MAC_CFG) >> 4) & 0x0f; /* Bail out if chip is not recognized. */ if (sc->msk_hw_id < CHIP_ID_YUKON_XL || - sc->msk_hw_id > CHIP_ID_YUKON_UL_2 || - sc->msk_hw_id == CHIP_ID_YUKON_SUPR) { + sc->msk_hw_id > CHIP_ID_YUKON_OPT || + sc->msk_hw_id == CHIP_ID_YUKON_SUPR || + sc->msk_hw_id == CHIP_ID_YUKON_UNKNOWN) { device_printf(dev, "unknown device: id=0x%02x, rev=0x%02x\n", sc->msk_hw_id, sc->msk_hw_rev); mtx_destroy(&sc->msk_mtx); @@ -1819,6 +1829,10 @@ sc->msk_clock = 125; /* 125 MHz */ sc->msk_pflags |= MSK_FLAG_JUMBO; break; + case CHIP_ID_YUKON_OPT: + sc->msk_clock = 125; /* 125 MHz */ + sc->msk_pflags |= MSK_FLAG_JUMBO | MSK_FLAG_DESCV2; + break; default: sc->msk_clock = 156; /* 156 MHz */ break; @@ -3917,6 +3931,11 @@ msk_stop(sc_if); return; } + if (sc->msk_hw_id == CHIP_ID_YUKON_EX) { + /* Disable flushing of non-ASF packets. */ + CSR_WRITE_4(sc, MR_ADDR(sc_if->msk_port, RX_GMF_CTRL_T), + GMF_RX_MACSEC_FLUSH_OFF); + } /* Configure interrupt handling. */ if (sc_if->msk_port == MSK_PORT_A) { ==== //depot/projects/scottl-camlock/src/sys/dev/msk/if_mskreg.h#13 (text+ko) ==== @@ -93,7 +93,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/*$FreeBSD: src/sys/dev/msk/if_mskreg.h,v 1.38 2010/04/30 00:34:00 yongari Exp $*/ +/*$FreeBSD: src/sys/dev/msk/if_mskreg.h,v 1.40 2010/04/30 18:58:55 yongari Exp $*/ /* * SysKonnect PCI vendor ID @@ -145,6 +145,7 @@ #define DEVICEID_MRVL_436B 0x436B #define DEVICEID_MRVL_436C 0x436C #define DEVICEID_MRVL_4380 0x4380 +#define DEVICEID_MRVL_4381 0x4381 /* * D-Link gigabit ethernet device ID @@ -828,6 +829,9 @@ #define Y2_IS_CHK_RX2 BIT_10 /* Descriptor error Rx 2 */ #define Y2_IS_CHK_TXS2 BIT_9 /* Descriptor error TXS 2 */ #define Y2_IS_CHK_TXA2 BIT_8 /* Descriptor error TXA 2 */ +#define Y2_IS_PSM_ACK BIT_7 /* PSM Ack (Yukon Optima) */ +#define Y2_IS_PTP_TIST BIT_6 /* PTP TIme Stamp (Yukon Optima) */ +#define Y2_IS_PHY_QLNK BIT_5 /* PHY Quick Link (Yukon Optima) */ #define Y2_IS_IRQ_PHY1 BIT_4 /* Interrupt from PHY 1 */ #define Y2_IS_IRQ_MAC1 BIT_3 /* Interrupt from MAC 1 */ #define Y2_IS_CHK_RX1 BIT_2 /* Descriptor error Rx 1 */ @@ -894,6 +898,8 @@ #define CHIP_ID_YUKON_FE_P 0xb8 /* Chip ID for YUKON-2 FE+ */ #define CHIP_ID_YUKON_SUPR 0xb9 /* Chip ID for YUKON-2 Supreme */ #define CHIP_ID_YUKON_UL_2 0xba /* Chip ID for YUKON-2 Ultra 2 */ +#define CHIP_ID_YUKON_UNKNOWN 0xbb +#define CHIP_ID_YUKON_OPT 0xbc /* Chip ID for YUKON-2 Optima */ #define CHIP_REV_YU_XL_A0 0 /* Chip Rev. for Yukon-2 A0 */ #define CHIP_REV_YU_XL_A1 1 /* Chip Rev. for Yukon-2 A1 */ @@ -1941,6 +1947,8 @@ #define RX_TRUNC_OFF BIT_26 /* disable packet truncation */ #define RX_VLAN_STRIP_ON BIT_25 /* enable VLAN stripping */ #define RX_VLAN_STRIP_OFF BIT_24 /* disable VLAN stripping */ +#define GMF_RX_MACSEC_FLUSH_ON BIT_23 +#define GMF_RX_MACSEC_FLUSH_OFF BIT_22 #define GMF_RX_OVER_ON BIT_19 /* enable flushing on receive overrun */ #define GMF_RX_OVER_OFF BIT_18 /* disable flushing on receive overrun */ #define GMF_ASF_RX_OVER_ON BIT_17 /* enable flushing of ASF when overrun */ ==== //depot/projects/scottl-camlock/src/sys/kern/subr_taskqueue.c#14 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/subr_taskqueue.c,v 1.52 2009/10/23 15:14:54 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_taskqueue.c,v 1.53 2010/04/30 16:29:05 zml Exp $"); #include #include @@ -51,7 +51,6 @@ const char *tq_name; taskqueue_enqueue_fn tq_enqueue; void *tq_context; - struct task *tq_running; struct mtx tq_mutex; struct thread **tq_threads; int tq_tcount; @@ -233,13 +232,13 @@ STAILQ_REMOVE_HEAD(&queue->tq_queue, ta_link); pending = task->ta_pending; task->ta_pending = 0; - queue->tq_running = task; + task->ta_flags |= TA_FLAGS_RUNNING; TQ_UNLOCK(queue); task->ta_func(task->ta_context, pending); TQ_LOCK(queue); - queue->tq_running = NULL; + task->ta_flags &= ~TA_FLAGS_RUNNING; wakeup(task); } @@ -256,14 +255,16 @@ { if (queue->tq_spin) { /* XXX */ mtx_lock_spin(&queue->tq_mutex); - while (task->ta_pending != 0 || task == queue->tq_running) + while (task->ta_pending != 0 || + (task->ta_flags & TA_FLAGS_RUNNING) != 0) msleep_spin(task, &queue->tq_mutex, "-", 0); mtx_unlock_spin(&queue->tq_mutex); } else { WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, __func__); mtx_lock(&queue->tq_mutex); - while (task->ta_pending != 0 || task == queue->tq_running) + while (task->ta_pending != 0 || + (task->ta_flags & TA_FLAGS_RUNNING) != 0) msleep(task, &queue->tq_mutex, PWAIT, "-", 0); mtx_unlock(&queue->tq_mutex); } ==== //depot/projects/scottl-camlock/src/sys/mips/mips/pmap.c#16 (text+ko) ==== @@ -66,7 +66,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/mips/mips/pmap.c,v 1.43 2010/04/30 00:46:43 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/mips/mips/pmap.c,v 1.44 2010/04/30 17:12:20 rrs Exp $"); #include "opt_ddb.h" #include "opt_msgbuf.h" @@ -236,7 +236,7 @@ sched_pin(); \ va1 = sysm->base; \ va2 = sysm->base + PAGE_SIZE; \ - npte = mips_paddr_to_tlbpfn(phys2) | \ + npte = mips_paddr_to_tlbpfn(phys1) | \ PTE_RW | PTE_V | PTE_G | PTE_W | PTE_CACHE; \ pte = pmap_pte(kernel_pmap, va1); \ *pte = npte; \ ==== //depot/projects/scottl-camlock/src/sys/powerpc/booke/pmap.c#14 (text+ko) ==== @@ -49,7 +49,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/booke/pmap.c,v 1.24 2010/04/30 00:46:43 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/booke/pmap.c,v 1.25 2010/04/30 15:22:52 alc Exp $"); #include #include @@ -1915,16 +1915,11 @@ tlb_miss_lock(); /* Handle modified pages. */ - if (PTE_ISMODIFIED(pte)) + if (PTE_ISMODIFIED(pte) && PTE_ISMANAGED(pte)) vm_page_dirty(m); - /* Referenced pages. */ - if (PTE_ISREFERENCED(pte)) - vm_page_flag_set(m, PG_REFERENCED); - tlb0_flush_entry(va); - pte->flags &= ~(PTE_UW | PTE_SW | PTE_MODIFIED | - PTE_REFERENCED); + pte->flags &= ~(PTE_UW | PTE_SW | PTE_MODIFIED); tlb_miss_unlock(); mtx_unlock_spin(&tlbivax_mutex); @@ -1962,13 +1957,8 @@ if (PTE_ISMODIFIED(pte)) vm_page_dirty(m); - /* Referenced pages. */ - if (PTE_ISREFERENCED(pte)) - vm_page_flag_set(m, PG_REFERENCED); - /* Flush mapping from TLB0. */ - pte->flags &= ~(PTE_UW | PTE_SW | PTE_MODIFIED | - PTE_REFERENCED); + pte->flags &= ~(PTE_UW | PTE_SW | PTE_MODIFIED); tlb_miss_unlock(); mtx_unlock_spin(&tlbivax_mutex); ==== //depot/projects/scottl-camlock/src/sys/sys/_task.h#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/_task.h,v 1.6 2008/07/18 06:22:57 kmacy Exp $ + * $FreeBSD: src/sys/sys/_task.h,v 1.7 2010/04/30 16:29:05 zml Exp $ */ #ifndef _SYS__TASK_H_ @@ -36,15 +36,21 @@ * taskqueue_run(). The first argument is taken from the 'ta_context' * field of struct task and the second argument is a count of how many * times the task was enqueued before the call to taskqueue_run(). + * + * List of locks + * (c) const after init + * (q) taskqueue lock */ typedef void task_fn_t(void *context, int pending); struct task { - STAILQ_ENTRY(task) ta_link; /* link for queue */ - u_short ta_pending; /* count times queued */ - u_short ta_priority; /* Priority */ - task_fn_t *ta_func; /* task handler */ - void *ta_context; /* argument for handler */ + STAILQ_ENTRY(task) ta_link; /* (q) link for queue */ + u_int ta_flags; /* (q) state of this task */ +#define TA_FLAGS_RUNNING 0x01 + u_short ta_pending; /* (q) count times queued */ + u_short ta_priority; /* (c) Priority */ + task_fn_t *ta_func; /* (c) task handler */ + void *ta_context; /* (c) argument for handler */ }; #endif /* !_SYS__TASK_H_ */ ==== //depot/projects/scottl-camlock/src/sys/sys/taskqueue.h#8 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/taskqueue.h,v 1.22 2009/08/18 13:55:48 pjd Exp $ + * $FreeBSD: src/sys/sys/taskqueue.h,v 1.23 2010/04/30 16:29:05 zml Exp $ */ #ifndef _SYS_TASKQUEUE_H_ @@ -75,6 +75,7 @@ (task)->ta_priority = (priority); \ (task)->ta_func = (func); \ (task)->ta_context = (context); \ + (task)->ta_flags = 0; \ } while (0) /* ==== //depot/projects/scottl-camlock/src/sys/vm/vm_contig.c#22 (text+ko) ==== @@ -60,7 +60,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_contig.c,v 1.75 2010/04/30 00:46:43 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_contig.c,v 1.76 2010/04/30 21:20:14 kmacy Exp $"); #include #include @@ -96,30 +96,33 @@ vm_page_t m_tmp; struct vnode *vp; struct mount *mp; - int vfslocked; + int vfslocked, dirty; - mtx_assert(&vm_page_queue_mtx, MA_OWNED); + vm_page_lock(m); + vm_page_lock_queues(); object = m->object; if (!VM_OBJECT_TRYLOCK(object) && !vm_pageout_fallback_object_lock(m, next)) { VM_OBJECT_UNLOCK(object); + vm_page_unlock_queues(); + vm_page_unlock(m); return (EAGAIN); } if (vm_page_sleep_if_busy(m, TRUE, "vpctw0")) { VM_OBJECT_UNLOCK(object); - vm_page_lock_queues(); return (EBUSY); } vm_page_test_dirty(m); if (m->dirty == 0 && m->hold_count == 0) pmap_remove_all(m); - if (m->dirty) { + if ((dirty = m->dirty) != 0) { + vm_page_unlock_queues(); + vm_page_unlock(m); if ((object->flags & OBJ_DEAD) != 0) { VM_OBJECT_UNLOCK(object); return (EAGAIN); } if (object->type == OBJT_VNODE) { - vm_page_unlock_queues(); vp = object->handle; vm_object_reference_locked(object); VM_OBJECT_UNLOCK(object); @@ -133,7 +136,6 @@ VFS_UNLOCK_GIANT(vfslocked); vm_object_deallocate(object); vn_finished_write(mp); - vm_page_lock_queues(); return (0); } else if (object->type == OBJT_SWAP || object->type == OBJT_DEFAULT) { @@ -144,6 +146,11 @@ } } else if (m->hold_count == 0) vm_page_cache(m); + + if (dirty == 0) { + vm_page_unlock_queues(); + vm_page_unlock(m); + } VM_OBJECT_UNLOCK(object); return (0); } @@ -162,7 +169,9 @@ KASSERT(VM_PAGE_INQUEUE2(m, queue), ("vm_contig_launder: page %p's queue is not %d", m, queue)); + vm_page_unlock_queues(); error = vm_contig_launder_page(m, &next); + vm_page_lock_queues(); if (error == 0) return (TRUE); if (error == EBUSY) ==== //depot/projects/scottl-camlock/src/sys/vm/vm_fault.c#33 (text+ko) ==== @@ -72,7 +72,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_fault.c,v 1.268 2010/04/30 00:46:43 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_fault.c,v 1.269 2010/04/30 16:20:14 kib Exp $"); #include "opt_vm.h" @@ -1284,19 +1284,19 @@ vm_page_lock_queues(); vm_page_unwire(src_m, 0); vm_page_unlock_queues(); - vm_page_lock(src_m); + vm_page_unlock(src_m); vm_page_lock(dst_m); vm_page_lock_queues(); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat May 1 16:24:14 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 08B3C1065673; Sat, 1 May 2010 16:24:14 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C188B106564A for ; Sat, 1 May 2010 16:24:13 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id AFB478FC08 for ; Sat, 1 May 2010 16:24:13 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o41GODsx036183 for ; Sat, 1 May 2010 16:24:13 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o41GOD2v036181 for perforce@freebsd.org; Sat, 1 May 2010 16:24:13 GMT (envelope-from mav@freebsd.org) Date: Sat, 1 May 2010 16:24:13 GMT Message-Id: <201005011624.o41GOD2v036181@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177558 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 May 2010 16:24:14 -0000 http://p4web.freebsd.org/@@177558?ac=10 Change 177558 by mav@mav_mavtest on 2010/05/01 16:23:44 DMA auto-activate capability doesn't depend on pm_level. Affected files ... .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#110 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#110 (text+ko) ==== @@ -2511,11 +2511,11 @@ cts->xport_specific.sata.caps |= CTS_SATA_CAPS_H_PMREQ; if (ch->caps2 & AHCI_CAP2_APST) cts->xport_specific.sata.caps |= CTS_SATA_CAPS_H_APST; - if (ch->caps & AHCI_CAP_SNCQ) - cts->xport_specific.sata.caps |= CTS_SATA_CAPS_H_DMAAA; - cts->xport_specific.sata.caps &= - ch->user[ccb->ccb_h.target_id].caps; } + if (ch->caps & AHCI_CAP_SNCQ) + cts->xport_specific.sata.caps |= CTS_SATA_CAPS_H_DMAAA; + cts->xport_specific.sata.caps &= + ch->user[ccb->ccb_h.target_id].caps; cts->xport_specific.sata.valid |= CTS_SATA_VALID_CAPS; } else { cts->xport_specific.sata.revision = d->revision; From owner-p4-projects@FreeBSD.ORG Sat May 1 16:27:17 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 676B71065675; Sat, 1 May 2010 16:27:17 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 13EE71065673 for ; Sat, 1 May 2010 16:27:17 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 01AA88FC15 for ; Sat, 1 May 2010 16:27:17 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o41GRGdo036419 for ; Sat, 1 May 2010 16:27:16 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o41GRG9o036417 for perforce@freebsd.org; Sat, 1 May 2010 16:27:16 GMT (envelope-from mav@freebsd.org) Date: Sat, 1 May 2010 16:27:16 GMT Message-Id: <201005011627.o41GRG9o036417@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177559 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 May 2010 16:27:17 -0000 http://p4web.freebsd.org/@@177559?ac=10 Change 177559 by mav@mav_mavtest on 2010/05/01 16:26:44 Add SATA capabilities negotiation support for PMP. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_pmp.c#34 edit .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#88 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_pmp.c#34 (text+ko) ==== @@ -101,6 +101,7 @@ int events; #define PMP_EV_RESET 1 #define PMP_EV_RESCAN 2 + u_int caps; struct task sysctl_task; struct sysctl_ctx_list sysctl_ctx; struct sysctl_oid *sysctl_tree; @@ -457,6 +458,14 @@ ata_pm_read_cmd(ataio, 2, 15); break; case PMP_STATE_PRECONFIG: + /* Get/update host SATA capabilities. */ + bzero(&cts, sizeof(cts)); + xpt_setup_ccb(&cts.ccb_h, periph->path, CAM_PRIORITY_NONE); + cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS; + cts.type = CTS_TYPE_CURRENT_SETTINGS; + xpt_action((union ccb *)&cts); + if (cts.xport_specific.sata.valid & CTS_SATA_VALID_CAPS) + softc->caps = cts.xport_specific.sata.caps; cam_fill_ataio(ataio, pmp_retry_count, pmpdone, @@ -660,6 +669,9 @@ cts.type = CTS_TYPE_CURRENT_SETTINGS; cts.xport_specific.sata.revision = (res & 0x0f0) >> 4; cts.xport_specific.sata.valid = CTS_SATA_VALID_REVISION; + cts.xport_specific.sata.caps = softc->caps & + (CTS_SATA_CAPS_H_PMREQ | CTS_SATA_CAPS_H_DMAAA); + cts.xport_specific.sata.valid |= CTS_SATA_VALID_CAPS; xpt_action((union ccb *)&cts); xpt_free_path(dpath); } ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#88 (text+ko) ==== @@ -731,6 +731,7 @@ probe_softc *softc; struct cam_path *path; u_int32_t priority; + u_int caps; int found = 1; CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_TRACE, ("probedone\n")); @@ -925,9 +926,6 @@ xpt_schedule(periph, priority); return; case PROBE_SETMODE: - { - u_int caps = 0; - if (path->device->transport != XPORT_SATA) goto notsata; /* Set supported bits. */ @@ -938,6 +936,8 @@ xpt_action((union ccb *)&cts); if (cts.xport_specific.sata.valid & CTS_SATA_VALID_CAPS) caps = cts.xport_specific.sata.caps & CTS_SATA_CAPS_H; + else + caps = 0; if (ident_buf->satacapabilities != 0xffff) { if (ident_buf->satacapabilities & ATA_SUPPORT_IFPWRMNGTRCV) caps |= CTS_SATA_CAPS_D_PMREQ; @@ -968,7 +968,6 @@ return; } /* FALLTHROUGH */ - } case PROBE_SETPM: if (ident_buf->satacapabilities != 0xffff && ident_buf->satacapabilities & ATA_SUPPORT_DAPST) { @@ -1073,6 +1072,35 @@ snprintf(ident_buf->revision, sizeof(ident_buf->revision), "%04x", softc->pm_prv); path->device->flags |= CAM_DEV_IDENTIFY_DATA_VALID; + /* Set supported bits. */ + bzero(&cts, sizeof(cts)); + xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NONE); + cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS; + cts.type = CTS_TYPE_CURRENT_SETTINGS; + xpt_action((union ccb *)&cts); + if (cts.xport_specific.sata.valid & CTS_SATA_VALID_CAPS) + caps = cts.xport_specific.sata.caps & CTS_SATA_CAPS_H; + else + caps = 0; + /* All PMPs must support PM requests. */ + caps |= CTS_SATA_CAPS_D_PMREQ; + /* Mask unwanted bits. */ + bzero(&cts, sizeof(cts)); + xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NONE); + cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS; + cts.type = CTS_TYPE_USER_SETTINGS; + xpt_action((union ccb *)&cts); + if (cts.xport_specific.sata.valid & CTS_SATA_VALID_CAPS) + caps &= cts.xport_specific.sata.caps; + /* Store result to SIM. */ + bzero(&cts, sizeof(cts)); + xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NONE); + cts.ccb_h.func_code = XPT_SET_TRAN_SETTINGS; + cts.type = CTS_TYPE_CURRENT_SETTINGS; + cts.xport_specific.sata.caps = caps; + cts.xport_specific.sata.valid = CTS_SATA_VALID_CAPS; + xpt_action((union ccb *)&cts); + softc->caps = caps; if (periph->path->device->flags & CAM_DEV_UNCONFIGURED) { path->device->flags &= ~CAM_DEV_UNCONFIGURED; xpt_acquire_device(path->device); From owner-p4-projects@FreeBSD.ORG Sat May 1 18:16:30 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D57831065679; Sat, 1 May 2010 18:16:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 939AA1065674 for ; Sat, 1 May 2010 18:16:29 +0000 (UTC) (envelope-from aman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7FF058FC12 for ; Sat, 1 May 2010 18:16:29 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o41IGTNM057166 for ; Sat, 1 May 2010 18:16:29 GMT (envelope-from aman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o41IG6uH057147 for perforce@freebsd.org; Sat, 1 May 2010 18:16:06 GMT (envelope-from aman@freebsd.org) Date: Sat, 1 May 2010 18:16:06 GMT Message-Id: <201005011816.o41IG6uH057147@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to aman@freebsd.org using -f From: Aman Jassal To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177562 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 May 2010 18:16:30 -0000 http://p4web.freebsd.org/@@177562?ac=10 Change 177562 by aman@src on 2010/05/01 18:15:51 IFC, mainly there were 3 major modifications to handle here, which were : - Migrating IPCOMPSTAT_VERSION field - Removing all references to if_timer - Handling the addition of netisr.c in netstat's code Reviewed by: pgj Affected files ... .. //depot/projects/soc2009/pgj_libstat/src/COPYRIGHT#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/MAINTAINERS#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/Makefile.inc1#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/ObsoleteFiles.inc#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/UPDATING#6 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/cp/cp.1#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/cp/cp.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/cp/utils.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/csh/config.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/csh/config_p.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/date/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/date/date.1#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/date/date.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/ed/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/ed/main.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/kenv/kenv.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/kill/kill.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/ls/cmp.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/ls/ls.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/ls/ls.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/ls/print.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/pax/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/pax/cpio.1#2 delete .. //depot/projects/soc2009/pgj_libstat/src/bin/pax/cpio.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/pax/ftree.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/pax/gen_subs.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/pax/getoldopt.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/pax/sel_subs.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/pax/tar.1#2 delete .. //depot/projects/soc2009/pgj_libstat/src/bin/pax/tar.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/pkill/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/pkill/pkill.1#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/pkill/pkill.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/ps/extern.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/ps/keyword.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/ps/print.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/ps/ps.1#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/ps/ps.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/rcp/rcp.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/rmail/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/setfacl/file.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/setfacl/mask.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/setfacl/merge.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/setfacl/remove.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/setfacl/setfacl.1#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/setfacl/setfacl.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/setfacl/setfacl.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/setfacl/util.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/alias.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/alias.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/arith.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/arith.y#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/cd.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/error.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/error.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/eval.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/eval.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/exec.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/exec.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/expand.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/expand.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/histedit.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/input.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/input.h#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/jobs.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/mail.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/main.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/main.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/memalloc.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/memalloc.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/miscbltin.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/mkbuiltins#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/mkinit.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/mksyntax.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/myhistedit.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/mystring.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/options.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/options.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/output.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/output.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/parser.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/parser.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/redir.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/sh.1#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/show.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/show.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/trap.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/var.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/var.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/test/test.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/cddl/Makefile.inc#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/cddl/contrib/opensolaris/cmd/zfs/zfs.8#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/cddl/contrib/opensolaris/cmd/zpool/zpool.8#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/cddl/lib/drti/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/cddl/lib/libavl/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/cddl/lib/libctf/Makefile#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/cddl/lib/libdtrace/Makefile#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/cddl/lib/libnvpair/Makefile#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/cddl/lib/libumem/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/cddl/lib/libuutil/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/cddl/lib/libzfs/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/cddl/lib/libzpool/Makefile#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/cddl/sbin/zfs/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/cddl/sbin/zpool/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/cddl/usr.bin/ctfconvert/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/cddl/usr.bin/ctfdump/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/cddl/usr.bin/ctfmerge/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/cddl/usr.bin/sgsmsg/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/cddl/usr.bin/zinject/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/cddl/usr.bin/ztest/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/cddl/usr.sbin/dtrace/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/cddl/usr.sbin/lockstat/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/cddl/usr.sbin/zdb/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/AUTHORS#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/ChangeLog#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/Examples/ckbook.b#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/Examples/pi.b#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/Examples/primes.b#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/Examples/twins.b#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/FAQ#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/FREEBSD-upgrade#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/INSTALL#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/Makefile.am#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/Makefile.in#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/NEWS#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/README#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/Test/BUG.bc#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/Test/array.b#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/Test/arrayp.b#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/Test/aryprm.b#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/Test/atan.b#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/Test/checklib.b#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/Test/div.b#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/Test/exp.b#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/Test/fact.b#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/Test/jn.b#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/Test/ln.b#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/Test/mul.b#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/Test/raise.b#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/Test/signum#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/Test/sine.b#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/Test/sqrt.b#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/Test/sqrt1.b#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/Test/sqrt2.b#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/Test/testfn.b#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/Test/timetest#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/acconfig.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/aclocal.m4#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/bc/Makefile.am#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/bc/Makefile.in#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/bc/bc.y#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/bc/bcdefs.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/bc/const.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/bc/execute.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/bc/fix-libmath_h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/bc/global.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/bc/global.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/bc/libmath.b#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/bc/libmath.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/bc/load.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/bc/main.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/bc/proto.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/bc/sbc.y#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/bc/scan.l#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/bc/storage.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/bc/util.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/config.h.in#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/configure#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/configure.in#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/dc/Makefile.am#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/dc/Makefile.in#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/dc/array.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/dc/dc-proto.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/dc/dc-regdef.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/dc/dc.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/dc/dc.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/dc/eval.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/dc/misc.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/dc/numeric.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/dc/stack.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/dc/string.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/doc/Makefile.am#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/doc/Makefile.in#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/doc/bc.1#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/doc/bc.texi#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/doc/dc.1#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/doc/dc.texi#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/h/number.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/install-sh#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/lib/Makefile.am#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/lib/Makefile.in#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/lib/number.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/lib/testmul.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/lib/vfprintf.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/missing#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/mkinstalldirs#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bc/stamp-h.in#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/CHANGES#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/COPYRIGHT#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/FAQ#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/FAQ.xml#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/NSEC3-NOTES#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/README#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/check/named-checkconf.8#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/check/named-checkconf.html#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/check/named-checkzone.8#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/check/named-checkzone.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/check/named-checkzone.docbook#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/check/named-checkzone.html#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dig/dig.1#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dig/dig.html#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dig/dighost.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dig/host.1#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dig/host.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dig/host.html#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dig/nslookup.1#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dig/nslookup.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dig/nslookup.html#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dnssec/dnssec-dsfromkey.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.8#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.docbook#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.html#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dnssec/dnssec-keygen.8#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dnssec/dnssec-keygen.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dnssec/dnssec-keygen.html#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dnssec/dnssec-signzone.8#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dnssec/dnssec-signzone.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dnssec/dnssec-signzone.html#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dnssec/dnssectool.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dnssec/dnssectool.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/control.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/include/named/server.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/lwresd.8#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/lwresd.html#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/named.8#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/named.conf.5#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/named.conf.html#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/named.docbook#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/named.html#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/query.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/server.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/statschannel.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/update.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/nsupdate/nsupdate.1#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/nsupdate/nsupdate.html#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/rndc/rndc-confgen.8#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/rndc/rndc-confgen.html#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/rndc/rndc.8#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/rndc/rndc.conf.5#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/rndc/rndc.conf.html#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/rndc/rndc.html#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/config.h.in#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/configure.in#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/arm/Bv9ARM-book.xml#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/arm/Bv9ARM.ch01.html#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/arm/Bv9ARM.ch02.html#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/arm/Bv9ARM.ch03.html#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/arm/Bv9ARM.ch04.html#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/arm/Bv9ARM.ch05.html#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/arm/Bv9ARM.ch06.html#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/arm/Bv9ARM.ch07.html#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/arm/Bv9ARM.ch08.html#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/arm/Bv9ARM.ch09.html#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/arm/Bv9ARM.ch10.html#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/arm/Bv9ARM.html#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/arm/Bv9ARM.pdf#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/arm/man.dig.html#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/arm/man.dnssec-dsfromkey.html#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/arm/man.dnssec-keyfromlabel.html#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/arm/man.dnssec-keygen.html#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/arm/man.dnssec-signzone.html#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/arm/man.host.html#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/arm/man.named-checkconf.html#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/arm/man.named-checkzone.html#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/arm/man.named.html#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/arm/man.nsupdate.html#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/arm/man.rndc-confgen.html#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/arm/man.rndc.conf.html#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/arm/man.rndc.html#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/misc/Makefile.in#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/api#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/db.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/dispatch.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/dnssec.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/dst_api.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/dst_internal.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/dst_parse.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/db.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/dnssec.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/journal.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/keyvalues.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/name.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/ncache.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/nsec3.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/rbt.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/rdataset.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/resolver.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/result.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/types.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/validator.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/zone.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dst/dst.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/journal.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/masterdump.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/message.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/ncache.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/nsec3.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/opensslrsa_link.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rbt.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rbtdb.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rcode.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdatalist.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdataset.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdataslab.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/resolver.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/result.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/sdb.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/sdlz.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/spnego.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/validator.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/view.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/zone.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/api#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/base32.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/base64.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/heap.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/httpd.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/ia64/include/isc/atomic.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/include/isc/entropy.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/include/isc/netscope.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/include/isc/portset.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/include/isc/sha2.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/include/isc/util.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/inet_ntop.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/powerpc/include/isc/atomic.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/random.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/sha2.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/unix/ifiter_getifaddrs.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/unix/socket.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isccc/api#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isccfg/aclconf.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isccfg/api#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isccfg/include/isccfg/namedconf.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/lwres/api#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/lwres/context.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/lwres/getipnode.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/lwres/man/lwres.3#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/lwres/man/lwres.html#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/lwres/man/lwres_buffer.3#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/lwres/man/lwres_buffer.html#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/lwres/man/lwres_config.3#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/lwres/man/lwres_config.html#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/lwres/man/lwres_context.3#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/lwres/man/lwres_context.html#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/lwres/man/lwres_gabn.3#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/lwres/man/lwres_gabn.html#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/lwres/man/lwres_gethostent.3#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/lwres/man/lwres_gethostent.html#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/lwres/man/lwres_getipnode.3#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/lwres/man/lwres_getipnode.html#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/lwres/man/lwres_gnba.3#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/lwres/man/lwres_gnba.html#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/lwres/man/lwres_hstrerror.3#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/lwres/man/lwres_inetntop.3#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/lwres/man/lwres_inetntop.html#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/lwres/man/lwres_noop.3#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/lwres/man/lwres_noop.html#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/lwres/man/lwres_packet.3#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/lwres/man/lwres_packet.html#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/lwres/man/lwres_resutil.3#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/lwres/man/lwres_resutil.html#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/version#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bsnmp/gensnmpdef/gensnmpdef.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bsnmp/gensnmptree/gensnmptree.1#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bsnmp/snmp_mibII/BEGEMOT-MIB2-MIB.txt#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bsnmp/snmp_mibII/mibII.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bsnmp/snmp_mibII/mibII.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bsnmp/snmp_mibII/mibII_begemot.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bsnmp/snmp_mibII/mibII_tree.def#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bsnmp/snmpd/config.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bsnmp/snmpd/snmpmod.3#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/ABOUT-NLS#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/AUTHORS#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/COPYING#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/ChangeLog#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/FREEBSD-upgrade#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/INSTALL#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/NEWS#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/README#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/THANKS#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/TODO#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/doc/cpio.1#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/doc/cpio.texi#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/doc/version.texi#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/alloca_.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/argp-ba.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/argp-eexst.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/argp-fmtstream.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/argp-fmtstream.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/argp-fs-xinl.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/argp-help.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/argp-namefrob.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/argp-parse.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/argp-pin.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/argp-pv.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/argp-pvh.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/argp-xinl.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/argp.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/basename.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/dirname.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/dirname.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/error.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/error.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/exitfail.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/exitfail.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/fatal.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/full-write.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/full-write.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/getopt.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/getopt1.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/getopt_.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/getopt_int.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/gettext.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/hash.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/hash.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/intprops.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/inttostr.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/inttostr.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/mempcpy.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/paxerror.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/paxexit.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/paxlib.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/paxnames.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/quote.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/quote.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/quotearg.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/quotearg.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/rmt-command.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/rmt.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/rtapelib.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/safe-read.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/safe-read.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/safe-write.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/safe-write.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/savedir.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/savedir.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/strchrnul.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/stripslash.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/strndup.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/strnlen.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/system-ioctl.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/system.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/umaxtostr.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/unlocked-io.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/utimens.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/utimens.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/xalloc-die.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/xalloc.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/xmalloc.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/xstrndup.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/lib/xstrndup.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/src/copyin.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/src/copyout.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/src/copypass.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/src/cpio.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/src/cpiohdr.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/src/defer.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/src/defer.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/src/dstring.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/src/dstring.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/src/extern.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/src/filemode.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/src/filetypes.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/src/global.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/src/idcache.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/src/main.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/src/makepath.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/src/safe-stat.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/src/tar.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/src/tar.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/src/tarhdr.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/src/userspec.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/cpio/src/util.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/GNUmakefile#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/Makefile#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/README#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/TODO#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/attrstack.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/attrstack.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/config.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/config.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/csup.1#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/detailer.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/detailer.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/diff.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/diff.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/fattr.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/fattr.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/fattr_bsd.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/fattr_posix.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/fixups.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/fixups.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/fnmatch.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/fnmatch.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/globtree.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/globtree.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/idcache.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/idcache.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/keyword.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/keyword.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/lex.rcs.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/lister.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/lister.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/main.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/main.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/misc.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/misc.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/mux.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/mux.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/parse.y#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/pathcomp.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/pathcomp.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/proto.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/proto.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/queue.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/rcsfile.c#3 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/rcsfile.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/rcsparse.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/rcsparse.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/rcstokenizer.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/rcstokenizer.l#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/rsyncfile.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/rsyncfile.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/status.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/status.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/stream.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/stream.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/threads.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/threads.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/token.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/token.l#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/updater.c#3 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/csup/updater.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/dtc/Documentation/dtc-paper.bib#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/dtc/Documentation/dtc-paper.tex#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/dtc/Documentation/dts-format.txt#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/dtc/Documentation/manual.txt#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/dtc/GPL#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/dtc/Makefile#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/dtc/Makefile.convert-dtsv0#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/dtc/Makefile.ftdump#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/dtc/README.license#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/dtc/TODO#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/dtc/checks.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/dtc/convert-dtsv0-lexer.l#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/dtc/data.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/dtc/dtc-lexer.l#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/dtc/dtc-parser.y#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/dtc/dtc.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/dtc/dtc.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/dtc/flattree.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/dtc/fstree.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/dtc/ftdump.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/dtc/libfdt/Makefile.libfdt#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/dtc/libfdt/TODO#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/dtc/libfdt/fdt.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/dtc/libfdt/fdt.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/dtc/libfdt/fdt_ro.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/dtc/libfdt/fdt_rw.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/dtc/libfdt/fdt_strerror.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/dtc/libfdt/fdt_sw.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/dtc/libfdt/fdt_wip.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/dtc/libfdt/libfdt.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/dtc/libfdt/libfdt_env.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/dtc/libfdt/libfdt_internal.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/dtc/libfdt/version.lds#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/dtc/livetree.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/dtc/scripts/setlocalversion#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/dtc/srcpos.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/dtc/srcpos.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/dtc/treesource.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/dtc/util.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/dtc/util.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/expat/lib/xmlparse.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/expat/lib/xmltok_impl.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/gcc/config/freebsd-spec.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/gcc/config/mips/freebsd.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/gdb/gdb/config/mips/nm-fbsd.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/gdb/gdb/config/mips/tm-fbsd.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/gdb/gdb/mips-tdep.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/gdb/gdb/mipsfbsd-nat.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/gdb/gdb/mipsfbsd-tdep.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/gdb/gdb/mipsfbsd-tdep.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/groff/font/devutf8/R.proto#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/groff/tmac/an-old.tmac#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/groff/tmac/doc-common#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/groff/tmac/doc-old.tmac#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/groff/tmac/doc-syms#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/groff/tmac/doc.tmac#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/groff/tmac/groff_mdoc.man#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ipfilter/ipsend/sbpf.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/libpcap/inet.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/netcat/FREEBSD-upgrade#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/netcat/FREEBSD-vendor#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/netcat/nc.1#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/netcat/netcat.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/COPYRIGHT#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/ChangeLog#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/CommitLog#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/Makefile.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/NEWS#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/README#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/README.bk#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/README.patches#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/WHERE-TO-START#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/aclocal.m4#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/adjtimed/Makefile.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/arlib/Makefile.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/arlib/aclocal.m4#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/arlib/configure#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/build#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/clockstuff/Makefile.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/config.h.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/configure#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/configure.ac#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/flock-build#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/html/build/hints/solaris.xtra.4095849#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/html/copyright.html#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/html/drivers/driver40.html#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/include/Makefile.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/include/copyright.def#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/include/isc/Makefile.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/include/ntp_debug.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/include/version.def#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/kernel/Makefile.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/kernel/sys/Makefile.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/libntp/Makefile.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/libopts/Makefile.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/libparse/Makefile.am#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/libparse/Makefile.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/libparse/clk_rawdcf.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/ntpd/Makefile.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/ntpd/cmd_args.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/ntpd/ntp_crypto.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/ntpd/ntp_intres.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/ntpd/ntp_io.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/ntpd/ntp_request.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/ntpd/ntp_timer.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/ntpd/ntpd-opts.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/ntpd/ntpd-opts.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/ntpd/ntpd-opts.texi#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/ntpd/ntpd.1#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/ntpd/ntpd.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/ntpd/ntpdsim-opts.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/ntpd/ntpdsim-opts.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/ntpd/ntpdsim-opts.texi#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/ntpd/ntpdsim.1#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/ntpd/refclock_dumbclock.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/ntpd/refclock_hopfser.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/ntpd/refclock_jjy.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/ntpd/refclock_nmea.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/ntpd/refclock_palisade.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/ntpdate/Makefile.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/ntpdc/Makefile.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/ntpdc/ntpdc-opts.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/ntpdc/ntpdc-opts.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/ntpdc/ntpdc-opts.texi#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/ntpdc/ntpdc.1#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/ntpq/Makefile.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/ntpq/ntpq-opts.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/ntpq/ntpq-opts.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/ntpq/ntpq-opts.texi#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/ntpq/ntpq.1#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/ntpq/ntpq.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/packageinfo.sh#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/parseutil/Makefile.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/scripts/Makefile.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/sntp/Makefile.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/sntp/aclocal.m4#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/sntp/config.h.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/sntp/configure#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/sntp/configure.ac#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/sntp/libopts/Makefile.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/sntp/sntp-opts.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/sntp/sntp-opts.def#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/sntp/sntp-opts.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/sntp/sntp-opts.texi#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/sntp/sntp.1#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/sntp/version.def#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/util/Makefile.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/util/ntp-keygen-opts.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/util/ntp-keygen-opts.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/util/ntp-keygen-opts.texi#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/util/ntp-keygen.1#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/version#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/ntp/version.m4#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/one-true-awk/FIXES#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/one-true-awk/b.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/one-true-awk/lib.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/one-true-awk/mac.code#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/one-true-awk/main.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/one-true-awk/makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/one-true-awk/maketab.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/one-true-awk/proctab.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/one-true-awk/proto.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/one-true-awk/run.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/openpam/include/security/pam_appl.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/opie/libopie/getutmpentry.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/opie/libopie/insecure.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/opie/libopie/login.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/pf/man/pf.conf.5#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/pf/pfctl/parse.y#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/pf/pfctl/pf_print_state.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/pf/pfctl/pfctl_parser.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/CACerts#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/FREEBSD-upgrade#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/LICENSE#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/PGPKEYS#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/README#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/RELEASE_NOTES#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/cf/README#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/cf/cf/submit.cf#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/cf/feature/ldap_routing.m4#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/cf/m4/cfhead.m4#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/cf/m4/proto.m4#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/cf/m4/version.m4#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/contrib/qtool.pl#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/contrib/smcontrol.pl#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/doc/op/op.me#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/include/libmilter/mfapi.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/include/libmilter/mfdef.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/include/sm/conf.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/include/sm/ldap.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/include/sm/sem.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/libmilter/Makefile.m4#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/libmilter/comm.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/libmilter/docs/api.html#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/libmilter/docs/overview.html#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/libmilter/docs/smfi_addheader.html#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/libmilter/docs/smfi_chgheader.html#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/libmilter/docs/smfi_insheader.html#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/libmilter/engine.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/libmilter/example.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/libmilter/handler.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/libmilter/libmilter.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/libmilter/listener.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/libmilter/main.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/libmilter/worker.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/libsm/debug.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/libsm/ldap.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/libsm/mbdb.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/libsm/sem.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/libsm/t-sem.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/libsmdb/smdb1.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/libsmdb/smdb2.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/libsmutil/safefile.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/praliases/praliases.8#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/praliases/praliases.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/src/Makefile.m4#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/src/README#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/src/TRACEFLAGS#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/src/collect.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/src/conf.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/src/conf.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/src/daemon.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/src/deliver.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/src/envelope.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/src/headers.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/src/main.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/src/map.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/src/milter.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/src/queue.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/src/ratectrl.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/src/readcf.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/src/savemail.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/src/sendmail.8#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/src/sendmail.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/src/sfsasl.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/src/srvrsmtp.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/src/tls.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/src/usersmtp.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/src/util.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/src/version.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/sendmail/vacation/vacation.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/smbfs/smbutil/view.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/tcp_wrappers/hosts_access.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/telnet/telnetd/sys_term.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/telnet/telnetd/telnetd.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/top/username.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/top/utils.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/top/utils.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/tzcode/stdtime/asctime.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/tzcode/stdtime/ctime.3#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/tzcode/stdtime/difftime.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/tzcode/stdtime/localtime.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/tzcode/stdtime/private.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/tzcode/stdtime/time2posix.3#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/tzcode/stdtime/tzfile.5#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/tzcode/stdtime/tzfile.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/tzcode/zic/README#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/tzcode/zic/Theory#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/tzcode/zic/ialloc.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/tzcode/zic/private.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/tzcode/zic/scheck.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/tzcode/zic/zdump.8#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/tzcode/zic/zdump.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/tzcode/zic/zdump/Makefile#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/tzcode/zic/zic.8#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/tzcode/zic/zic.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/tzcode/zic/zic/Makefile#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/tzdata/africa#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/tzdata/antarctica#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/tzdata/asia#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/tzdata/australasia#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/tzdata/backward#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/tzdata/etcetera#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/tzdata/europe#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/tzdata/factory#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/tzdata/leapseconds#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/tzdata/northamerica#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/tzdata/pacificnew#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/tzdata/southamerica#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/tzdata/systemv#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/tzdata/yearistype.sh#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/tzdata/zone.tab#1 branch .. //depot/projects/soc2009/pgj_libstat/src/crypto/heimdal/kcm/connect.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/ChangeLog#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/INSTALL#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/PROTOCOL#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/PROTOCOL.agent#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/PROTOCOL.certkeys#1 branch .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/PROTOCOL.mux#1 branch .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/README#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/README.smartcard#2 delete .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/addrmatch.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/auth-krb5.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/auth-options.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/auth-options.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/auth-rh-rsa.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/auth-rhosts.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/auth-rsa.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/auth.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/auth.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/auth2-hostbased.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/auth2-pubkey.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/authfd.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/authfd.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/authfile.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/authfile.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/bufaux.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/buffer.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/buffer.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/canohost.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/channels.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/channels.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/clientloop.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/clientloop.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/config.guess#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/config.h#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/config.h.in#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/defines.h#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/dh.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/dns.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/dns.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/hostfile.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/hostfile.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/kex.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/kex.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/kexdhs.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/kexgexs.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/key.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/key.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/loginrec.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/match.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/misc.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/misc.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/monitor.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/monitor_fdpass.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/monitor_wrap.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/mux.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/myproposal.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/nchan.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/openbsd-compat/bsd-cygwin_util.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/openbsd-compat/openbsd-compat.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/openbsd-compat/openssl-compat.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/openbsd-compat/port-aix.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/openbsd-compat/port-aix.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/openbsd-compat/port-linux.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/openbsd-compat/port-linux.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/openbsd-compat/pwcache.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/openbsd-compat/readpassphrase.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/pathnames.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/pkcs11.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/platform.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/platform.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/readconf.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/readconf.h#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/roaming.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/roaming_client.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/roaming_common.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/roaming_serv.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/scard-opensc.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/scard.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/scard.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/scp.1#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/scp.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/servconf.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/servconf.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/session.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/sftp-client.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/sftp-client.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/sftp-common.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/sftp-common.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/sftp-server.8#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/sftp-server.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/sftp.1#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/sftp.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/ssh-add.1#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/ssh-add.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/ssh-agent.1#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/ssh-agent.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/ssh-dss.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/ssh-keygen.1#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/ssh-keygen.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/ssh-keyscan.1#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/ssh-keyscan.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/ssh-keysign.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/ssh-pkcs11-client.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/ssh-pkcs11-helper.0#1 branch .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/ssh-pkcs11-helper.8#1 branch .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/ssh-pkcs11-helper.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/ssh-pkcs11.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/ssh-pkcs11.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/ssh-rand-helper.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/ssh-rsa.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/ssh.1#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/ssh.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/ssh2.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/ssh_config#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/ssh_config.5#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/ssh_namespace.h#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/sshconnect.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/sshconnect2.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/sshd.8#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/sshd.c#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/sshd_config#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/sshd_config.5#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/sshpty.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/sshtty.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/version.h#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssl/CHANGES#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssl/Configure#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssl/FAQ#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssl/Makefile#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssl/Makefile.org#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssl/NEWS#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssl/README#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssl/apps/CA.sh#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssl/apps/Makefile#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssl/apps/apps.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssl/apps/ca.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssl/apps/dsa.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssl/apps/dsaparam.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssl/apps/enc.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssl/apps/gendsa.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssl/apps/genpkey.c#2 delete >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat May 1 19:30:44 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 75B061065670; Sat, 1 May 2010 19:30:44 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3A6F4106564A for ; Sat, 1 May 2010 19:30:44 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 276528FC0C for ; Sat, 1 May 2010 19:30:44 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o41JUinu063614 for ; Sat, 1 May 2010 19:30:44 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o41JUixn063612 for perforce@freebsd.org; Sat, 1 May 2010 19:30:44 GMT (envelope-from mav@freebsd.org) Date: Sat, 1 May 2010 19:30:44 GMT Message-Id: <201005011930.o41JUixn063612@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177566 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 May 2010 19:30:44 -0000 http://p4web.freebsd.org/@@177566?ac=10 Change 177566 by mav@mav_mavtest on 2010/05/01 19:29:49 - Deny DMA auto-activation for NVIDIA chipsets. - Do not try to initiate PM transitions if device uncapable. Affected files ... .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#111 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#111 (text+ko) ==== @@ -111,6 +111,7 @@ #define AHCI_Q_EDGEIS 64 #define AHCI_Q_SATA2 128 #define AHCI_Q_NOBSYRES 256 +#define AHCI_Q_NOAA 512 } ahci_ids[] = { {0x43801002, 0x00, "ATI IXP600", 0}, {0x43901002, 0x00, "ATI IXP700", 0}, @@ -167,75 +168,75 @@ {0x614511ab, 0x00, "Marvell 88SX6145", AHCI_Q_NOFORCE|AHCI_Q_4CH|AHCI_Q_EDGEIS}, {0x91231b4b, 0x11, "Marvell 88SE912x", AHCI_Q_NOBSYRES}, {0x91231b4b, 0x00, "Marvell 88SE912x", AHCI_Q_EDGEIS|AHCI_Q_SATA2|AHCI_Q_NOBSYRES}, - {0x044c10de, 0x00, "NVIDIA MCP65", 0}, - {0x044d10de, 0x00, "NVIDIA MCP65", 0}, - {0x044e10de, 0x00, "NVIDIA MCP65", 0}, - {0x044f10de, 0x00, "NVIDIA MCP65", 0}, - {0x045c10de, 0x00, "NVIDIA MCP65", 0}, - {0x045d10de, 0x00, "NVIDIA MCP65", 0}, - {0x045e10de, 0x00, "NVIDIA MCP65", 0}, - {0x045f10de, 0x00, "NVIDIA MCP65", 0}, - {0x055010de, 0x00, "NVIDIA MCP67", 0}, - {0x055110de, 0x00, "NVIDIA MCP67", 0}, - {0x055210de, 0x00, "NVIDIA MCP67", 0}, - {0x055310de, 0x00, "NVIDIA MCP67", 0}, - {0x055410de, 0x00, "NVIDIA MCP67", 0}, - {0x055510de, 0x00, "NVIDIA MCP67", 0}, - {0x055610de, 0x00, "NVIDIA MCP67", 0}, - {0x055710de, 0x00, "NVIDIA MCP67", 0}, - {0x055810de, 0x00, "NVIDIA MCP67", 0}, - {0x055910de, 0x00, "NVIDIA MCP67", 0}, - {0x055A10de, 0x00, "NVIDIA MCP67", 0}, - {0x055B10de, 0x00, "NVIDIA MCP67", 0}, - {0x058410de, 0x00, "NVIDIA MCP67", 0}, - {0x07f010de, 0x00, "NVIDIA MCP73", 0}, - {0x07f110de, 0x00, "NVIDIA MCP73", 0}, - {0x07f210de, 0x00, "NVIDIA MCP73", 0}, - {0x07f310de, 0x00, "NVIDIA MCP73", 0}, - {0x07f410de, 0x00, "NVIDIA MCP73", 0}, - {0x07f510de, 0x00, "NVIDIA MCP73", 0}, - {0x07f610de, 0x00, "NVIDIA MCP73", 0}, - {0x07f710de, 0x00, "NVIDIA MCP73", 0}, - {0x07f810de, 0x00, "NVIDIA MCP73", 0}, - {0x07f910de, 0x00, "NVIDIA MCP73", 0}, - {0x07fa10de, 0x00, "NVIDIA MCP73", 0}, - {0x07fb10de, 0x00, "NVIDIA MCP73", 0}, - {0x0ad010de, 0x00, "NVIDIA MCP77", 0}, - {0x0ad110de, 0x00, "NVIDIA MCP77", 0}, - {0x0ad210de, 0x00, "NVIDIA MCP77", 0}, - {0x0ad310de, 0x00, "NVIDIA MCP77", 0}, - {0x0ad410de, 0x00, "NVIDIA MCP77", 0}, - {0x0ad510de, 0x00, "NVIDIA MCP77", 0}, - {0x0ad610de, 0x00, "NVIDIA MCP77", 0}, - {0x0ad710de, 0x00, "NVIDIA MCP77", 0}, - {0x0ad810de, 0x00, "NVIDIA MCP77", 0}, - {0x0ad910de, 0x00, "NVIDIA MCP77", 0}, - {0x0ada10de, 0x00, "NVIDIA MCP77", 0}, - {0x0adb10de, 0x00, "NVIDIA MCP77", 0}, - {0x0ab410de, 0x00, "NVIDIA MCP79", 0}, - {0x0ab510de, 0x00, "NVIDIA MCP79", 0}, - {0x0ab610de, 0x00, "NVIDIA MCP79", 0}, - {0x0ab710de, 0x00, "NVIDIA MCP79", 0}, - {0x0ab810de, 0x00, "NVIDIA MCP79", 0}, - {0x0ab910de, 0x00, "NVIDIA MCP79", 0}, - {0x0aba10de, 0x00, "NVIDIA MCP79", 0}, - {0x0abb10de, 0x00, "NVIDIA MCP79", 0}, - {0x0abc10de, 0x00, "NVIDIA MCP79", 0}, - {0x0abd10de, 0x00, "NVIDIA MCP79", 0}, - {0x0abe10de, 0x00, "NVIDIA MCP79", 0}, - {0x0abf10de, 0x00, "NVIDIA MCP79", 0}, - {0x0d8410de, 0x00, "NVIDIA MCP89", 0}, - {0x0d8510de, 0x00, "NVIDIA MCP89", 0}, - {0x0d8610de, 0x00, "NVIDIA MCP89", 0}, - {0x0d8710de, 0x00, "NVIDIA MCP89", 0}, - {0x0d8810de, 0x00, "NVIDIA MCP89", 0}, - {0x0d8910de, 0x00, "NVIDIA MCP89", 0}, - {0x0d8a10de, 0x00, "NVIDIA MCP89", 0}, - {0x0d8b10de, 0x00, "NVIDIA MCP89", 0}, - {0x0d8c10de, 0x00, "NVIDIA MCP89", 0}, - {0x0d8d10de, 0x00, "NVIDIA MCP89", 0}, - {0x0d8e10de, 0x00, "NVIDIA MCP89", 0}, - {0x0d8f10de, 0x00, "NVIDIA MCP89", 0}, + {0x044c10de, 0x00, "NVIDIA MCP65", AHCI_Q_NOAA}, + {0x044d10de, 0x00, "NVIDIA MCP65", AHCI_Q_NOAA}, + {0x044e10de, 0x00, "NVIDIA MCP65", AHCI_Q_NOAA}, + {0x044f10de, 0x00, "NVIDIA MCP65", AHCI_Q_NOAA}, + {0x045c10de, 0x00, "NVIDIA MCP65", AHCI_Q_NOAA}, + {0x045d10de, 0x00, "NVIDIA MCP65", AHCI_Q_NOAA}, + {0x045e10de, 0x00, "NVIDIA MCP65", AHCI_Q_NOAA}, + {0x045f10de, 0x00, "NVIDIA MCP65", AHCI_Q_NOAA}, + {0x055010de, 0x00, "NVIDIA MCP67", AHCI_Q_NOAA}, + {0x055110de, 0x00, "NVIDIA MCP67", AHCI_Q_NOAA}, + {0x055210de, 0x00, "NVIDIA MCP67", AHCI_Q_NOAA}, + {0x055310de, 0x00, "NVIDIA MCP67", AHCI_Q_NOAA}, + {0x055410de, 0x00, "NVIDIA MCP67", AHCI_Q_NOAA}, + {0x055510de, 0x00, "NVIDIA MCP67", AHCI_Q_NOAA}, + {0x055610de, 0x00, "NVIDIA MCP67", AHCI_Q_NOAA}, + {0x055710de, 0x00, "NVIDIA MCP67", AHCI_Q_NOAA}, + {0x055810de, 0x00, "NVIDIA MCP67", AHCI_Q_NOAA}, + {0x055910de, 0x00, "NVIDIA MCP67", AHCI_Q_NOAA}, + {0x055A10de, 0x00, "NVIDIA MCP67", AHCI_Q_NOAA}, + {0x055B10de, 0x00, "NVIDIA MCP67", AHCI_Q_NOAA}, + {0x058410de, 0x00, "NVIDIA MCP67", AHCI_Q_NOAA}, + {0x07f010de, 0x00, "NVIDIA MCP73", AHCI_Q_NOAA}, + {0x07f110de, 0x00, "NVIDIA MCP73", AHCI_Q_NOAA}, + {0x07f210de, 0x00, "NVIDIA MCP73", AHCI_Q_NOAA}, + {0x07f310de, 0x00, "NVIDIA MCP73", AHCI_Q_NOAA}, + {0x07f410de, 0x00, "NVIDIA MCP73", AHCI_Q_NOAA}, + {0x07f510de, 0x00, "NVIDIA MCP73", AHCI_Q_NOAA}, + {0x07f610de, 0x00, "NVIDIA MCP73", AHCI_Q_NOAA}, + {0x07f710de, 0x00, "NVIDIA MCP73", AHCI_Q_NOAA}, + {0x07f810de, 0x00, "NVIDIA MCP73", AHCI_Q_NOAA}, + {0x07f910de, 0x00, "NVIDIA MCP73", AHCI_Q_NOAA}, + {0x07fa10de, 0x00, "NVIDIA MCP73", AHCI_Q_NOAA}, + {0x07fb10de, 0x00, "NVIDIA MCP73", AHCI_Q_NOAA}, + {0x0ad010de, 0x00, "NVIDIA MCP77", AHCI_Q_NOAA}, + {0x0ad110de, 0x00, "NVIDIA MCP77", AHCI_Q_NOAA}, + {0x0ad210de, 0x00, "NVIDIA MCP77", AHCI_Q_NOAA}, + {0x0ad310de, 0x00, "NVIDIA MCP77", AHCI_Q_NOAA}, + {0x0ad410de, 0x00, "NVIDIA MCP77", AHCI_Q_NOAA}, + {0x0ad510de, 0x00, "NVIDIA MCP77", AHCI_Q_NOAA}, + {0x0ad610de, 0x00, "NVIDIA MCP77", AHCI_Q_NOAA}, + {0x0ad710de, 0x00, "NVIDIA MCP77", AHCI_Q_NOAA}, + {0x0ad810de, 0x00, "NVIDIA MCP77", AHCI_Q_NOAA}, + {0x0ad910de, 0x00, "NVIDIA MCP77", AHCI_Q_NOAA}, + {0x0ada10de, 0x00, "NVIDIA MCP77", AHCI_Q_NOAA}, + {0x0adb10de, 0x00, "NVIDIA MCP77", AHCI_Q_NOAA}, + {0x0ab410de, 0x00, "NVIDIA MCP79", AHCI_Q_NOAA}, + {0x0ab510de, 0x00, "NVIDIA MCP79", AHCI_Q_NOAA}, + {0x0ab610de, 0x00, "NVIDIA MCP79", AHCI_Q_NOAA}, + {0x0ab710de, 0x00, "NVIDIA MCP79", AHCI_Q_NOAA}, + {0x0ab810de, 0x00, "NVIDIA MCP79", AHCI_Q_NOAA}, + {0x0ab910de, 0x00, "NVIDIA MCP79", AHCI_Q_NOAA}, + {0x0aba10de, 0x00, "NVIDIA MCP79", AHCI_Q_NOAA}, + {0x0abb10de, 0x00, "NVIDIA MCP79", AHCI_Q_NOAA}, + {0x0abc10de, 0x00, "NVIDIA MCP79", AHCI_Q_NOAA}, + {0x0abd10de, 0x00, "NVIDIA MCP79", AHCI_Q_NOAA}, + {0x0abe10de, 0x00, "NVIDIA MCP79", AHCI_Q_NOAA}, + {0x0abf10de, 0x00, "NVIDIA MCP79", AHCI_Q_NOAA}, + {0x0d8410de, 0x00, "NVIDIA MCP89", AHCI_Q_NOAA}, + {0x0d8510de, 0x00, "NVIDIA MCP89", AHCI_Q_NOAA}, + {0x0d8610de, 0x00, "NVIDIA MCP89", AHCI_Q_NOAA}, + {0x0d8710de, 0x00, "NVIDIA MCP89", AHCI_Q_NOAA}, + {0x0d8810de, 0x00, "NVIDIA MCP89", AHCI_Q_NOAA}, + {0x0d8910de, 0x00, "NVIDIA MCP89", AHCI_Q_NOAA}, + {0x0d8a10de, 0x00, "NVIDIA MCP89", AHCI_Q_NOAA}, + {0x0d8b10de, 0x00, "NVIDIA MCP89", AHCI_Q_NOAA}, + {0x0d8c10de, 0x00, "NVIDIA MCP89", AHCI_Q_NOAA}, + {0x0d8d10de, 0x00, "NVIDIA MCP89", AHCI_Q_NOAA}, + {0x0d8e10de, 0x00, "NVIDIA MCP89", AHCI_Q_NOAA}, + {0x0d8f10de, 0x00, "NVIDIA MCP89", AHCI_Q_NOAA}, {0x33491106, 0x00, "VIA VT8251", 0}, {0x62871106, 0x00, "VIA VT8251", 0}, {0x11841039, 0x00, "SiS 966", 0}, @@ -1967,7 +1968,8 @@ et != AHCI_ERR_TIMEOUT) ahci_rearm_timeout(dev); /* Start PM timer. */ - if (ch->numrslots == 0 && ch->pm_level > 3) { + if (ch->numrslots == 0 && ch->pm_level > 3 && + (ch->curr[ch->pm_present ? 15 : 0].caps & CTS_SATA_CAPS_D_PMREQ)) { callout_schedule(&ch->pm_timer, (ch->pm_level == 4) ? hz / 1000 : hz / 8); } @@ -2512,7 +2514,8 @@ if (ch->caps2 & AHCI_CAP2_APST) cts->xport_specific.sata.caps |= CTS_SATA_CAPS_H_APST; } - if (ch->caps & AHCI_CAP_SNCQ) + if ((ch->caps & AHCI_CAP_SNCQ) && + (ch->quirks & AHCI_Q_NOAA) == 0) cts->xport_specific.sata.caps |= CTS_SATA_CAPS_H_DMAAA; cts->xport_specific.sata.caps &= ch->user[ccb->ccb_h.target_id].caps; From owner-p4-projects@FreeBSD.ORG Sat May 1 20:10:24 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 73C4D1065672; Sat, 1 May 2010 20:10:24 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 386E2106564A for ; Sat, 1 May 2010 20:10:24 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 26CA58FC0A for ; Sat, 1 May 2010 20:10:24 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o41KAOAl067561 for ; Sat, 1 May 2010 20:10:24 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o41KAOls067559 for perforce@freebsd.org; Sat, 1 May 2010 20:10:24 GMT (envelope-from mav@freebsd.org) Date: Sat, 1 May 2010 20:10:24 GMT Message-Id: <201005012010.o41KAOls067559@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177569 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 May 2010 20:10:24 -0000 http://p4web.freebsd.org/@@177569?ac=10 Change 177569 by mav@mav_mavtest on 2010/05/01 20:10:13 Count devices in partial/slumber as connected. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_pmp.c#35 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_pmp.c#35 (text+ko) ==== @@ -653,14 +653,16 @@ (done_ccb->ataio.res.lba_mid << 16) + (done_ccb->ataio.res.lba_low << 8) + done_ccb->ataio.res.sector_count; - if ((res & 0xf0f) == 0x103 && (res & 0x0f0) != 0) { + if (((res & 0xf0f) == 0x103 && (res & 0x0f0) != 0) || + (res & 0x600) != 0) { if (bootverbose) { printf("%s%d: port %d status: %08x\n", periph->periph_name, periph->unit_number, softc->pm_step, res); } - /* Report device speed. */ - if (xpt_create_path(&dpath, periph, + /* Report device speed if it is online. */ + if ((res & 0xf0f) == 0x103 && + xpt_create_path(&dpath, periph, xpt_path_path_id(periph->path), softc->pm_step, 0) == CAM_REQ_CMP) { bzero(&cts, sizeof(cts)); From owner-p4-projects@FreeBSD.ORG Sat May 1 20:16:31 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AC8FA1065670; Sat, 1 May 2010 20:16:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7160B106564A for ; Sat, 1 May 2010 20:16:30 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5FCE28FC08 for ; Sat, 1 May 2010 20:16:30 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o41KGUei067981 for ; Sat, 1 May 2010 20:16:30 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o41KGUnH067979 for perforce@freebsd.org; Sat, 1 May 2010 20:16:30 GMT (envelope-from mav@freebsd.org) Date: Sat, 1 May 2010 20:16:30 GMT Message-Id: <201005012016.o41KGUnH067979@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177570 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 May 2010 20:16:31 -0000 http://p4web.freebsd.org/@@177570?ac=10 Change 177570 by mav@mav_mavtest on 2010/05/01 20:16:04 Add SATA capabilities reporting (PM) support to siis. Affected files ... .. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#47 edit .. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.h#17 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#47 (text+ko) ==== @@ -448,6 +448,8 @@ ch->user[i].bytecount = 8192; ch->user[i].tags = SIIS_MAX_SLOTS; ch->curr[i] = ch->user[i]; + if (ch->pm_level) + ch->user[i].caps = CTS_SATA_CAPS_H_PMREQ; } mtx_init(&ch->mtx, "SIIS channel lock", NULL, MTX_DEF); rid = ch->unit; @@ -1697,6 +1699,8 @@ } if (cts->xport_specific.sata.valid & CTS_SATA_VALID_TAGS) d->atapi = cts->xport_specific.sata.atapi; + if (cts->xport_specific.sata.valid & CTS_SATA_VALID_CAPS) + d->caps = cts->xport_specific.sata.caps; ccb->ccb_h.status = CAM_REQ_CMP; break; } @@ -1729,9 +1733,17 @@ cts->xport_specific.sata.valid |= CTS_SATA_VALID_REVISION; } + cts->xport_specific.sata.caps = d->caps & CTS_SATA_CAPS_D; + if (ch->pm_level) + cts->xport_specific.sata.caps |= CTS_SATA_CAPS_H_PMREQ; + cts->xport_specific.sata.caps &= + ch->user[ccb->ccb_h.target_id].caps; + cts->xport_specific.sata.valid |= CTS_SATA_VALID_CAPS; } else { cts->xport_specific.sata.revision = d->revision; cts->xport_specific.sata.valid |= CTS_SATA_VALID_REVISION; + cts->xport_specific.sata.caps = d->caps; + cts->xport_specific.sata.valid |= CTS_SATA_VALID_CAPS; } cts->xport_specific.sata.mode = d->mode; cts->xport_specific.sata.valid |= CTS_SATA_VALID_MODE; ==== //depot/projects/scottl-camlock/src/sys/dev/siis/siis.h#17 (text+ko) ==== @@ -358,6 +358,7 @@ u_int bytecount; u_int atapi; u_int tags; + u_int caps; }; /* structure describing an ATA channel */