From owner-svn-src-stable-6@FreeBSD.ORG Sun Jan 18 12:59:37 2009 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7C82D1065676; Sun, 18 Jan 2009 12:59:37 +0000 (UTC) (envelope-from stas@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 69E4F8FC14; Sun, 18 Jan 2009 12:59:37 +0000 (UTC) (envelope-from stas@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0ICxbfZ074198; Sun, 18 Jan 2009 12:59:37 GMT (envelope-from stas@svn.freebsd.org) Received: (from stas@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0ICxbqe074197; Sun, 18 Jan 2009 12:59:37 GMT (envelope-from stas@svn.freebsd.org) Message-Id: <200901181259.n0ICxbqe074197@svn.freebsd.org> From: Stanislav Sedov Date: Sun, 18 Jan 2009 12:59:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r187393 - in stable/6/sys: . dev/usb X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Jan 2009 12:59:38 -0000 Author: stas Date: Sun Jan 18 12:59:37 2009 New Revision: 187393 URL: http://svn.freebsd.org/changeset/base/187393 Log: - MFC r174660: Add quirk for the TrendNet TU-S9 adapter, which uses new version of PL2303 chip (revision 0x400). This allows it to be correctly identified as PL2303X. PR: usb/128115 Submitted by: Borodin Oleg Modified: stable/6/sys/ (props changed) stable/6/sys/dev/usb/uplcom.c Modified: stable/6/sys/dev/usb/uplcom.c ============================================================================== --- stable/6/sys/dev/usb/uplcom.c Sun Jan 18 12:35:11 2009 (r187392) +++ stable/6/sys/dev/usb/uplcom.c Sun Jan 18 12:59:37 2009 (r187393) @@ -240,6 +240,9 @@ static const struct uplcom_product { { USB_VENDOR_PROLIFIC2, USB_PRODUCT_PROLIFIC2_WSIM, -1, TYPE_PL2303X}, /* PLANEX USB-RS232 URS-03 */ { USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC232A, -1, TYPE_PL2303 }, + /* TrendNet TU-S9 */ + { USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2303, + 0x400, TYPE_PL2303X }, /* ST Lab USB-SERIAL-4 */ { USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2303, 0x300, TYPE_PL2303X }, From owner-svn-src-stable-6@FreeBSD.ORG Mon Jan 19 15:38:27 2009 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9731E106564A; Mon, 19 Jan 2009 15:38:26 +0000 (UTC) (envelope-from sobomax@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 84EAA8FC1A; Mon, 19 Jan 2009 15:38:26 +0000 (UTC) (envelope-from sobomax@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0JFcQIf014203; Mon, 19 Jan 2009 15:38:26 GMT (envelope-from sobomax@svn.freebsd.org) Received: (from sobomax@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0JFcQla014202; Mon, 19 Jan 2009 15:38:26 GMT (envelope-from sobomax@svn.freebsd.org) Message-Id: <200901191538.n0JFcQla014202@svn.freebsd.org> From: Maxim Sobolev Date: Mon, 19 Jan 2009 15:38:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r187435 - stable/6/sys/amd64/conf X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Jan 2009 15:38:27 -0000 Author: sobomax Date: Mon Jan 19 15:38:26 2009 New Revision: 187435 URL: http://svn.freebsd.org/changeset/base/187435 Log: MFC: take NTFS out to match i386 GENERIC. Modified: stable/6/sys/amd64/conf/GENERIC Modified: stable/6/sys/amd64/conf/GENERIC ============================================================================== --- stable/6/sys/amd64/conf/GENERIC Mon Jan 19 15:36:25 2009 (r187434) +++ stable/6/sys/amd64/conf/GENERIC Mon Jan 19 15:38:26 2009 (r187435) @@ -40,7 +40,6 @@ options NFSCLIENT # Network Filesystem options NFSSERVER # Network Filesystem Server options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCLIENT -options NTFS # NT File System options MSDOSFS # MSDOS Filesystem options CD9660 # ISO 9660 Filesystem options PROCFS # Process filesystem (requires PSEUDOFS) From owner-svn-src-stable-6@FreeBSD.ORG Mon Jan 19 16:23:08 2009 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C29F410656F3; Mon, 19 Jan 2009 16:23:08 +0000 (UTC) (envelope-from thompsa@FreeBSD.org) Received: from pele.citylink.co.nz (pele.citylink.co.nz [202.8.44.226]) by mx1.freebsd.org (Postfix) with ESMTP id 83D058FC17; Mon, 19 Jan 2009 16:23:08 +0000 (UTC) (envelope-from thompsa@FreeBSD.org) Received: from localhost (localhost [127.0.0.1]) by pele.citylink.co.nz (Postfix) with ESMTP id AF453FEF4; Tue, 20 Jan 2009 04:52:48 +1300 (NZDT) X-Virus-Scanned: Debian amavisd-new at citylink.co.nz Received: from pele.citylink.co.nz ([127.0.0.1]) by localhost (pele.citylink.co.nz [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id haiPCldKrIhD; Tue, 20 Jan 2009 04:52:45 +1300 (NZDT) Received: from citylink.fud.org.nz (unknown [202.8.44.45]) by pele.citylink.co.nz (Postfix) with ESMTP; Tue, 20 Jan 2009 04:52:45 +1300 (NZDT) Received: by citylink.fud.org.nz (Postfix, from userid 1001) id AFE841142C; Tue, 20 Jan 2009 04:52:44 +1300 (NZDT) Date: Mon, 19 Jan 2009 07:52:44 -0800 From: Andrew Thompson To: Maxim Sobolev Message-ID: <20090119155244.GB44812@citylink.fud.org.nz> References: <200901191538.n0JFcQla014202@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200901191538.n0JFcQla014202@svn.freebsd.org> User-Agent: Mutt/1.5.17 (2007-11-01) Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-6@freebsd.org Subject: Re: svn commit: r187435 - stable/6/sys/amd64/conf X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Jan 2009 16:23:10 -0000 On Mon, Jan 19, 2009 at 03:38:26PM +0000, Maxim Sobolev wrote: > Author: sobomax > Date: Mon Jan 19 15:38:26 2009 > New Revision: 187435 > URL: http://svn.freebsd.org/changeset/base/187435 > > Log: > MFC: take NTFS out to match i386 GENERIC. > > Modified: > stable/6/sys/amd64/conf/GENERIC > > Modified: stable/6/sys/amd64/conf/GENERIC > ============================================================================== > --- stable/6/sys/amd64/conf/GENERIC Mon Jan 19 15:36:25 2009 (r187434) > +++ stable/6/sys/amd64/conf/GENERIC Mon Jan 19 15:38:26 2009 (r187435) > @@ -40,7 +40,6 @@ options NFSCLIENT # Network Filesystem > options NFSSERVER # Network Filesystem Server > options NFSLOCKD # Network Lock Manager > options NFS_ROOT # NFS usable as /, requires NFSCLIENT > -options NTFS # NT File System > options MSDOSFS # MSDOS Filesystem > options CD9660 # ISO 9660 Filesystem > options PROCFS # Process filesystem (requires PSEUDOFS) Easy on, this is a stable branch. From owner-svn-src-stable-6@FreeBSD.ORG Mon Jan 19 17:06:29 2009 Return-Path: Delivered-To: svn-src-stable-6@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 52088106566B for ; Mon, 19 Jan 2009 17:06:29 +0000 (UTC) (envelope-from obrien@NUXI.org) Received: from dragon.nuxi.org (trang.nuxi.org [74.95.12.85]) by mx1.freebsd.org (Postfix) with ESMTP id F10DC8FC12 for ; Mon, 19 Jan 2009 17:06:28 +0000 (UTC) (envelope-from obrien@NUXI.org) Received: from dragon.nuxi.org (obrien@localhost [127.0.0.1]) by dragon.nuxi.org (8.14.2/8.14.2) with ESMTP id n0JGsVbR018810; Mon, 19 Jan 2009 08:54:31 -0800 (PST) (envelope-from obrien@dragon.nuxi.org) Received: (from obrien@localhost) by dragon.nuxi.org (8.14.2/8.14.2/Submit) id n0JGsUAn018809; Mon, 19 Jan 2009 08:54:30 -0800 (PST) (envelope-from obrien) Date: Mon, 19 Jan 2009 08:54:30 -0800 From: "David O'Brien" To: Maxim Sobolev Message-ID: <20090119165430.GA18775@dragon.NUXI.org> References: <200901191538.n0JFcQla014202@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200901191538.n0JFcQla014202@svn.freebsd.org> X-Operating-System: FreeBSD 8.0-CURRENT User-Agent: Mutt/1.5.16 (2007-06-09) Cc: svn-src-stable@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org, svn-src-stable-6@FreeBSD.org Subject: Re: svn commit: r187435 - stable/6/sys/amd64/conf X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: obrien@FreeBSD.org List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Jan 2009 17:06:29 -0000 On Mon, Jan 19, 2009 at 03:38:26PM +0000, Maxim Sobolev wrote: > Author: sobomax > Date: Mon Jan 19 15:38:26 2009 > New Revision: 187435 > URL: http://svn.freebsd.org/changeset/base/187435 > > Log: > MFC: take NTFS out to match i386 GENERIC. > > Modified: > stable/6/sys/amd64/conf/GENERIC .. > Modified: stable/6/sys/amd64/conf/GENERIC > -options NTFS # NT File System Seriously - this is the type of change that could easily piss off our users. Please back it out. At this point for 6.x this is really a POLA issue. From owner-svn-src-stable-6@FreeBSD.ORG Mon Jan 19 17:17:32 2009 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C50E2106566B; Mon, 19 Jan 2009 17:17:32 +0000 (UTC) (envelope-from sobomax@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B31CF8FC0C; Mon, 19 Jan 2009 17:17:32 +0000 (UTC) (envelope-from sobomax@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0JHHWuT016466; Mon, 19 Jan 2009 17:17:32 GMT (envelope-from sobomax@svn.freebsd.org) Received: (from sobomax@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0JHHWHL016465; Mon, 19 Jan 2009 17:17:32 GMT (envelope-from sobomax@svn.freebsd.org) Message-Id: <200901191717.n0JHHWHL016465@svn.freebsd.org> From: Maxim Sobolev Date: Mon, 19 Jan 2009 17:17:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r187441 - stable/6/sys/amd64/conf X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Jan 2009 17:17:33 -0000 Author: sobomax Date: Mon Jan 19 17:17:32 2009 New Revision: 187441 URL: http://svn.freebsd.org/changeset/base/187441 Log: Put NTFS back, it's probably not worth to touch 6-STABLE now when it's in the maintenance mode and AFAIK no more releases are planned from this branch. Modified: stable/6/sys/amd64/conf/GENERIC Modified: stable/6/sys/amd64/conf/GENERIC ============================================================================== --- stable/6/sys/amd64/conf/GENERIC Mon Jan 19 17:14:03 2009 (r187440) +++ stable/6/sys/amd64/conf/GENERIC Mon Jan 19 17:17:32 2009 (r187441) @@ -40,6 +40,7 @@ options NFSCLIENT # Network Filesystem options NFSSERVER # Network Filesystem Server options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCLIENT +options NTFS # NT File System options MSDOSFS # MSDOS Filesystem options CD9660 # ISO 9660 Filesystem options PROCFS # Process filesystem (requires PSEUDOFS) From owner-svn-src-stable-6@FreeBSD.ORG Mon Jan 19 21:43:49 2009 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5B3A5106568D; Mon, 19 Jan 2009 21:43:49 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3DA6F8FC1B; Mon, 19 Jan 2009 21:43:49 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0JLhmTV022308; Mon, 19 Jan 2009 21:43:48 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0JLhmIq022307; Mon, 19 Jan 2009 21:43:48 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <200901192143.n0JLhmIq022307@svn.freebsd.org> From: Marius Strobl Date: Mon, 19 Jan 2009 21:43:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r187449 - stable/6/share/man/man4 X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Jan 2009 21:43:50 -0000 Author: marius Date: Mon Jan 19 21:43:48 2009 New Revision: 187449 URL: http://svn.freebsd.org/changeset/base/187449 Log: - MFC: 154328 Add the HP NC7771 adapter to the list of known products. - MFC: 162584 Add documentation on the new bge tunable. Also put the tunable docs into a separate section. - MFC: 162825 Spelling - MFC: 169881 (bge.4 part) Remove BCM5704S specific tunable (hw.bge.fake_autoneg) and auto-detect the condition. - MFC: 174903 Mention support for the 5722 driver in bge.4 as well. - MFC: 187315 Sync the description of jumbo frame support with reality as of r187310; it's also supported with BCM5702 (matched by BGE_ASICREV_BCM5703) but bge(4) currently doesn't with neither BCM5714 nor BCM5780. Modified: stable/6/share/man/man4/ (props changed) stable/6/share/man/man4/bge.4 Modified: stable/6/share/man/man4/bge.4 ============================================================================== --- stable/6/share/man/man4/bge.4 Mon Jan 19 21:42:54 2009 (r187448) +++ stable/6/share/man/man4/bge.4 Mon Jan 19 21:43:48 2009 (r187449) @@ -31,12 +31,12 @@ .\" .\" $FreeBSD$ .\" -.Dd January 30, 2007 +.Dd January 15, 2009 .Dt BGE 4 .Os .Sh NAME .Nm bge -.Nd "Broadcom BCM570x/5714/5721/5750/5751/5752/5789 PCI Gigabit Ethernet adapter driver" +.Nd "Broadcom BCM570x/5714/5721/5722/5750/5751/5752/5789 PCI Gigabit Ethernet adapter driver" .Sh SYNOPSIS To compile this driver into the kernel, place the following lines in your @@ -56,7 +56,7 @@ if_bge_load="YES" The .Nm driver provides support for various NICs based on the Broadcom BCM570x, -5714, 5721, 5750, 5751, 5752 and 5789 families of Gigabit Ethernet +5714, 5721, 5722, 5750, 5751, 5752 and 5789 families of Gigabit Ethernet controller chips. .Pp All of these NICs are capable of 10, 100 and 1000Mbps speeds over CAT5 @@ -82,7 +82,7 @@ copper gigabit transceivers, which support autonegotiation of 10, 100 and 1000Mbps modes in full or half duplex. .Pp -The BCM5700, BCM5701, BCM5703, BCM5704, BCM5714 and BCM5780 also support +The BCM5700, BCM5701, BCM5702, BCM5703 and BCM5704 also support jumbo frames, which can be configured via the interface MTU setting. Selecting an MTU larger than 1500 bytes with the @@ -194,6 +194,8 @@ HP ProLiant NC7760 embedded Gigabit NIC .It HP ProLiant NC7770 PCI-X Gigabit NIC (10/100/1000baseTX) .It +HP ProLiant NC7771 PCI-X Gigabit NIC (10/100/1000baseTX) +.It HP ProLiant NC7781 embedded PCI-X Gigabit NIC (10/100/1000baseTX) .It Netgear GA302T (10/100/1000baseTX) @@ -202,6 +204,17 @@ SysKonnect SK-9D21 (10/100/1000baseTX) .It SysKonnect SK-9D41 (1000baseSX) .El +.Sh LOADER TUNABLES +The following tunable can be set at the +.Xr loader 8 +prompt before booting the kernel, or stored in +.Xr loader.conf 5 . +.Bl -tag -width indent +.It Va hw.bge.allow_asf +Allow the ASF feature for cooperating with IPMI. +Can cause system lockup problems on a small number of systems. +Disabled by default. +.El .Sh DIAGNOSTICS .Bl -diag .It "bge%d: couldn't map memory" From owner-svn-src-stable-6@FreeBSD.ORG Mon Jan 19 21:47:06 2009 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 63E4D1065675; Mon, 19 Jan 2009 21:47:06 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 50E6C8FC0C; Mon, 19 Jan 2009 21:47:06 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0JLl6m7022495; Mon, 19 Jan 2009 21:47:06 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0JLl6Fe022493; Mon, 19 Jan 2009 21:47:06 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <200901192147.n0JLl6Fe022493@svn.freebsd.org> From: Marius Strobl Date: Mon, 19 Jan 2009 21:47:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r187451 - stable/6/share/man/man4 X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Jan 2009 21:47:09 -0000 Author: marius Date: Mon Jan 19 21:47:06 2009 New Revision: 187451 URL: http://svn.freebsd.org/changeset/base/187451 Log: MFC: r187316 Don't cross-reference gem(4) and hme(4); maybe this made some sense back when these two were the only two NIC drivers working on sparc64 but it no longer does nowadays. Modified: stable/6/share/man/man4/ (props changed) stable/6/share/man/man4/gem.4 stable/6/share/man/man4/hme.4 Modified: stable/6/share/man/man4/gem.4 ============================================================================== --- stable/6/share/man/man4/gem.4 Mon Jan 19 21:47:01 2009 (r187450) +++ stable/6/share/man/man4/gem.4 Mon Jan 19 21:47:06 2009 (r187451) @@ -33,7 +33,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 26, 2007 +.Dd January 15, 2009 .Dt GEM 4 .Os .Sh NAME @@ -115,7 +115,6 @@ driver fails to attach to Sun Gigabit Et as no SBus front-end has been written so far. .Sh SEE ALSO .Xr altq 4 , -.Xr hme 4 , .Xr miibus 4 , .Xr netintro 4 , .Xr eeprom 8 , Modified: stable/6/share/man/man4/hme.4 ============================================================================== --- stable/6/share/man/man4/hme.4 Mon Jan 19 21:47:01 2009 (r187450) +++ stable/6/share/man/man4/hme.4 Mon Jan 19 21:47:06 2009 (r187451) @@ -36,7 +36,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 16, 2005 +.Dd January 15, 2009 .Dt HME 4 .Os .Sh NAME @@ -120,7 +120,6 @@ on boards equipped with more than one Et except the single-port SBus versions. .Sh SEE ALSO .Xr altq 4 , -.Xr gem 4 , .Xr intro 4 , .Xr miibus 4 , .Xr netintro 4 , From owner-svn-src-stable-6@FreeBSD.ORG Mon Jan 19 21:49:46 2009 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 655B510656C4; Mon, 19 Jan 2009 21:49:46 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 525E28FC0C; Mon, 19 Jan 2009 21:49:46 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0JLnkBB022646; Mon, 19 Jan 2009 21:49:46 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0JLnkF1022645; Mon, 19 Jan 2009 21:49:46 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <200901192149.n0JLnkF1022645@svn.freebsd.org> From: Marius Strobl Date: Mon, 19 Jan 2009 21:49:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r187453 - stable/6/share/man/man4 X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Jan 2009 21:49:47 -0000 Author: marius Date: Mon Jan 19 21:49:46 2009 New Revision: 187453 URL: http://svn.freebsd.org/changeset/base/187453 Log: MFC: r187341 Update URL. Modified: stable/6/share/man/man4/ (props changed) stable/6/share/man/man4/hme.4 Modified: stable/6/share/man/man4/hme.4 ============================================================================== --- stable/6/share/man/man4/hme.4 Mon Jan 19 21:49:22 2009 (r187452) +++ stable/6/share/man/man4/hme.4 Mon Jan 19 21:49:46 2009 (r187453) @@ -36,7 +36,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 15, 2009 +.Dd January 16, 2009 .Dt HME 4 .Os .Sh NAME @@ -129,7 +129,7 @@ except the single-port SBus versions. .%T "STP2002QFP Fast Ethernet, Parallel Port, SCSI (FEPS) User's Guide" .%D April 1996 .%A Sun Microelectronics -.%O http://www.sun.com/oem/products/manuals/STP2002QFP-UG.pdf +.%O http://mediacast.sun.com/users/Barton808/media/STP2002QFP-FEPs_UG.pdf .Re .Sh HISTORY The From owner-svn-src-stable-6@FreeBSD.ORG Wed Jan 21 15:04:06 2009 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D1A03106567D; Wed, 21 Jan 2009 15:04:06 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id BE8BD8FC18; Wed, 21 Jan 2009 15:04:06 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0LF46E2081010; Wed, 21 Jan 2009 15:04:06 GMT (envelope-from emaste@svn.freebsd.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0LF46BP081009; Wed, 21 Jan 2009 15:04:06 GMT (envelope-from emaste@svn.freebsd.org) Message-Id: <200901211504.n0LF46BP081009@svn.freebsd.org> From: Ed Maste Date: Wed, 21 Jan 2009 15:04:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r187530 - in stable/6/sys: . vm X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Jan 2009 15:04:10 -0000 Author: emaste Date: Wed Jan 21 15:04:06 2009 New Revision: 187530 URL: http://svn.freebsd.org/changeset/base/187530 Log: MFC r181693: Fix REDZONE(9) on amd64 and perhaps other 64 bit targets -- ensure the space that redzone adds to the allocation for storing its metadata is at least as large as the metadata that it will store there. PR: kern/128744 Modified: stable/6/sys/ (props changed) stable/6/sys/vm/redzone.c Modified: stable/6/sys/vm/redzone.c ============================================================================== --- stable/6/sys/vm/redzone.c Wed Jan 21 15:01:36 2009 (r187529) +++ stable/6/sys/vm/redzone.c Wed Jan 21 15:04:06 2009 (r187530) @@ -54,6 +54,8 @@ static u_long redzone_roundup(u_long n) { + if (n < REDZONE_HSIZE) + n = REDZONE_HSIZE; if (n <= 128) return (128); else if (n <= 256) From owner-svn-src-stable-6@FreeBSD.ORG Wed Jan 21 15:25:01 2009 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 76112106566B; Wed, 21 Jan 2009 15:25:01 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 635C98FC18; Wed, 21 Jan 2009 15:25:01 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0LFP0eY081609; Wed, 21 Jan 2009 15:25:00 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0LFP0jn081608; Wed, 21 Jan 2009 15:25:00 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <200901211525.n0LFP0jn081608@svn.freebsd.org> From: John Baldwin Date: Wed, 21 Jan 2009 15:25:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r187533 - stable/6/gnu/usr.bin/gdb/kgdb X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Jan 2009 15:25:02 -0000 Author: jhb Date: Wed Jan 21 15:25:00 2009 New Revision: 187533 URL: http://svn.freebsd.org/changeset/base/187533 Log: MFC: Use existing GDB routines for parsing the section table of klds in the 'add-kld' command. Modified: stable/6/gnu/usr.bin/gdb/kgdb/ (props changed) stable/6/gnu/usr.bin/gdb/kgdb/kld.c Modified: stable/6/gnu/usr.bin/gdb/kgdb/kld.c ============================================================================== --- stable/6/gnu/usr.bin/gdb/kgdb/kld.c Wed Jan 21 15:19:38 2009 (r187532) +++ stable/6/gnu/usr.bin/gdb/kgdb/kld.c Wed Jan 21 15:25:00 2009 (r187533) @@ -37,6 +37,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -196,39 +197,14 @@ find_kld_address (char *arg, CORE_ADDR * return (0); } -struct add_section_info { - struct section_addr_info *section_addrs; - int sect_index; - CORE_ADDR base_addr; -}; - -static void -add_section (bfd *bfd, asection *sect, void *arg) -{ - struct add_section_info *asi = arg; - CORE_ADDR address; - char *name; - - /* Ignore non-resident sections. */ - if ((bfd_get_section_flags(bfd, sect) & (SEC_ALLOC | SEC_LOAD)) == 0) - return; - - name = xstrdup(bfd_get_section_name(bfd, sect)); - make_cleanup(xfree, name); - address = asi->base_addr + bfd_get_section_vma(bfd, sect); - asi->section_addrs->other[asi->sect_index].name = name; - asi->section_addrs->other[asi->sect_index].addr = address; - asi->section_addrs->other[asi->sect_index].sectindex = sect->index; - printf_unfiltered("\t%s_addr = %s\n", name, local_hex_string(address)); - asi->sect_index++; -} - static void load_kld (char *path, CORE_ADDR base_addr, int from_tty) { - struct add_section_info asi; + struct section_addr_info *sap; + struct section_table *sections = NULL, *sections_end = NULL, *s; struct cleanup *cleanup; bfd *bfd; + int i; /* Open the kld. */ bfd = bfd_openr(path, gnutarget); @@ -244,19 +220,30 @@ load_kld (char *path, CORE_ADDR base_add if (bfd_get_section_by_name (bfd, ".text") == NULL) error("\"%s\": can't find text section", path); - printf_unfiltered("add symbol table from file \"%s\" at\n", path); + /* Build a section table from the bfd and relocate the sections. */ + if (build_section_table (bfd, §ions, §ions_end)) + error("\"%s\": can't find file sections", path); + cleanup = make_cleanup(xfree, sections); + for (s = sections; s < sections_end; s++) { + s->addr += base_addr; + s->endaddr += base_addr; + } + + /* Build a section addr info to pass to symbol_file_add(). */ + sap = build_section_addr_info_from_section_table (sections, + sections_end); + cleanup = make_cleanup((make_cleanup_ftype *)free_section_addr_info, + sap); - /* Build a section table for symbol_file_add() from the bfd sections. */ - asi.section_addrs = alloc_section_addr_info(bfd_count_sections(bfd)); - cleanup = make_cleanup(xfree, asi.section_addrs); - asi.sect_index = 0; - asi.base_addr = base_addr; - bfd_map_over_sections(bfd, add_section, &asi); + printf_unfiltered("add symbol table from file \"%s\" at\n", path); + for (i = 0; i < sap->num_sections; i++) + printf_unfiltered("\t%s_addr = %s\n", sap->other[i].name, + local_hex_string(sap->other[i].addr)); if (from_tty && (!query("%s", ""))) error("Not confirmed."); - symbol_file_add(path, from_tty, asi.section_addrs, 0, OBJF_USERLOADED); + symbol_file_add(path, from_tty, sap, 0, OBJF_USERLOADED); do_cleanups(cleanup); } From owner-svn-src-stable-6@FreeBSD.ORG Wed Jan 21 16:28:15 2009 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7996A1065672; Wed, 21 Jan 2009 16:28:15 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 668328FC16; Wed, 21 Jan 2009 16:28:15 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0LGSF83083051; Wed, 21 Jan 2009 16:28:15 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0LGSFev083048; Wed, 21 Jan 2009 16:28:15 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <200901211628.n0LGSFev083048@svn.freebsd.org> From: John Baldwin Date: Wed, 21 Jan 2009 16:28:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r187536 - in stable/6/sys: . compat/freebsd32 compat/ia32 X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Jan 2009 16:28:16 -0000 Author: jhb Date: Wed Jan 21 16:28:15 2009 New Revision: 187536 URL: http://svn.freebsd.org/changeset/base/187536 Log: MFC: Add support for installing 32-bit system calls from kernel modules. Modified: stable/6/sys/ (props changed) stable/6/sys/compat/freebsd32/freebsd32_misc.c stable/6/sys/compat/freebsd32/freebsd32_util.h stable/6/sys/compat/ia32/ia32_sysvec.c Modified: stable/6/sys/compat/freebsd32/freebsd32_misc.c ============================================================================== --- stable/6/sys/compat/freebsd32/freebsd32_misc.c Wed Jan 21 16:14:43 2009 (r187535) +++ stable/6/sys/compat/freebsd32/freebsd32_misc.c Wed Jan 21 16:28:15 2009 (r187536) @@ -2298,3 +2298,83 @@ freebsd32_xxx(struct thread *td, struct } #endif + +int +syscall32_register(int *offset, struct sysent *new_sysent, + struct sysent *old_sysent) +{ + if (*offset == NO_SYSCALL) { + int i; + + for (i = 1; i < SYS_MAXSYSCALL; ++i) + if (freebsd32_sysent[i].sy_call == + (sy_call_t *)lkmnosys) + break; + if (i == SYS_MAXSYSCALL) + return (ENFILE); + *offset = i; + } else if (*offset < 0 || *offset >= SYS_MAXSYSCALL) + return (EINVAL); + else if (freebsd32_sysent[*offset].sy_call != (sy_call_t *)lkmnosys && + freebsd32_sysent[*offset].sy_call != (sy_call_t *)lkmressys) + return (EEXIST); + + *old_sysent = freebsd32_sysent[*offset]; + freebsd32_sysent[*offset] = *new_sysent; + return 0; +} + +int +syscall32_deregister(int *offset, struct sysent *old_sysent) +{ + + if (*offset) + freebsd32_sysent[*offset] = *old_sysent; + return 0; +} + +int +syscall32_module_handler(struct module *mod, int what, void *arg) +{ + struct syscall_module_data *data = (struct syscall_module_data*)arg; + modspecific_t ms; + int error; + + switch (what) { + case MOD_LOAD: + error = syscall32_register(data->offset, data->new_sysent, + &data->old_sysent); + if (error) { + /* Leave a mark so we know to safely unload below. */ + data->offset = NULL; + return error; + } + ms.intval = *data->offset; + MOD_XLOCK; + module_setspecific(mod, &ms); + MOD_XUNLOCK; + if (data->chainevh) + error = data->chainevh(mod, what, data->chainarg); + return (error); + case MOD_UNLOAD: + /* + * MOD_LOAD failed, so just return without calling the + * chained handler since we didn't pass along the MOD_LOAD + * event. + */ + if (data->offset == NULL) + return (0); + if (data->chainevh) { + error = data->chainevh(mod, what, data->chainarg); + if (error) + return (error); + } + error = syscall32_deregister(data->offset, &data->old_sysent); + return (error); + default: + error = EOPNOTSUPP; + if (data->chainevh) + error = data->chainevh(mod, what, data->chainarg); + return (error); + } +} Modified: stable/6/sys/compat/freebsd32/freebsd32_util.h ============================================================================== --- stable/6/sys/compat/freebsd32/freebsd32_util.h Wed Jan 21 16:14:43 2009 (r187535) +++ stable/6/sys/compat/freebsd32/freebsd32_util.h Wed Jan 21 16:28:15 2009 (r187536) @@ -28,14 +28,16 @@ * $FreeBSD$ */ -#include -#include -#include - +#ifndef _COMPAT_FREEBSD32_FREEBSD32_UTIL_H_ +#define _COMPAT_FREEBSD32_FREEBSD32_UTIL_H_ +#include #include #include -#include + +#include +#include +#include struct freebsd32_ps_strings { u_int32_t ps_argvstr; /* first of 0 or more argument strings */ @@ -50,3 +52,35 @@ struct freebsd32_ps_strings { #define FREEBSD32_PS_STRINGS \ (FREEBSD32_USRSTACK - sizeof(struct freebsd32_ps_strings)) + +extern struct sysent freebsd32_sysent[]; + +#define SYSCALL32_MODULE(name, offset, new_sysent, evh, arg) \ +static struct syscall_module_data name##_syscall32_mod = { \ + evh, arg, offset, new_sysent, { 0, NULL } \ +}; \ + \ +static moduledata_t name##32_mod = { \ + #name, \ + syscall32_module_handler, \ + &name##_syscall32_mod \ +}; \ +DECLARE_MODULE(name##32, name##32_mod, SI_SUB_SYSCALLS, SI_ORDER_MIDDLE) + +#define SYSCALL32_MODULE_HELPER(syscallname) \ +static int syscallname##_syscall32 = FREEBSD32_SYS_##syscallname; \ +static struct sysent syscallname##_sysent32 = { \ + (sizeof(struct syscallname ## _args ) \ + / sizeof(register_t)), \ + (sy_call_t *)& syscallname \ +}; \ +SYSCALL32_MODULE(syscallname, \ + & syscallname##_syscall32, & syscallname##_sysent32,\ + NULL, NULL); + +int syscall32_register(int *offset, struct sysent *new_sysent, + struct sysent *old_sysent); +int syscall32_deregister(int *offset, struct sysent *old_sysent); +int syscall32_module_handler(struct module *mod, int what, void *arg); + +#endif /* !_COMPAT_FREEBSD32_FREEBSD32_UTIL_H_ */ Modified: stable/6/sys/compat/ia32/ia32_sysvec.c ============================================================================== --- stable/6/sys/compat/ia32/ia32_sysvec.c Wed Jan 21 16:14:43 2009 (r187535) +++ stable/6/sys/compat/ia32/ia32_sysvec.c Wed Jan 21 16:28:15 2009 (r187536) @@ -95,8 +95,6 @@ CTASSERT(sizeof(struct ia32_sigframe4) = static register_t *ia32_copyout_strings(struct image_params *imgp); static void ia32_fixlimit(struct rlimit *rl, int which); -extern struct sysent freebsd32_sysent[]; - SYSCTL_NODE(_compat, OID_AUTO, ia32, CTLFLAG_RW, 0, "ia32 mode"); struct sysentvec ia32_freebsd_sysvec = { From owner-svn-src-stable-6@FreeBSD.ORG Wed Jan 21 17:03:55 2009 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A37ED1065749; Wed, 21 Jan 2009 17:03:55 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 84B908FC14; Wed, 21 Jan 2009 17:03:55 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0LH3tOu083890; Wed, 21 Jan 2009 17:03:55 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0LH3t0a083886; Wed, 21 Jan 2009 17:03:55 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <200901211703.n0LH3t0a083886@svn.freebsd.org> From: John Baldwin Date: Wed, 21 Jan 2009 17:03:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r187537 - in stable/6/sys: . compat/freebsd32 kern sys X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Jan 2009 17:03:56 -0000 Author: jhb Date: Wed Jan 21 17:03:55 2009 New Revision: 187537 URL: http://svn.freebsd.org/changeset/base/187537 Log: MFC: Split most of getdirentries() out into a kern_getdirentries() and add a freebsd32 frontend to fix a data corruption bug with 32-bit binaries. Modified: stable/6/sys/ (props changed) stable/6/sys/compat/freebsd32/freebsd32_misc.c stable/6/sys/compat/freebsd32/syscalls.master stable/6/sys/kern/vfs_syscalls.c stable/6/sys/sys/syscallsubr.h Modified: stable/6/sys/compat/freebsd32/freebsd32_misc.c ============================================================================== --- stable/6/sys/compat/freebsd32/freebsd32_misc.c Wed Jan 21 16:28:15 2009 (r187536) +++ stable/6/sys/compat/freebsd32/freebsd32_misc.c Wed Jan 21 17:03:55 2009 (r187537) @@ -1702,6 +1702,24 @@ freebsd32_ftruncate(struct thread *td, s return (ftruncate(td, &ap)); } +int +freebsd32_getdirentries(struct thread *td, + struct freebsd32_getdirentries_args *uap) +{ + long base; + int32_t base32; + int error; + + error = kern_getdirentries(td, uap->fd, uap->buf, uap->count, &base); + if (error) + return (error); + if (uap->basep != NULL) { + base32 = base; + error = copyout(&base32, uap->basep, sizeof(int32_t)); + } + return (error); +} + struct sf_hdtr32 { uint32_t headers; int hdr_cnt; Modified: stable/6/sys/compat/freebsd32/syscalls.master ============================================================================== --- stable/6/sys/compat/freebsd32/syscalls.master Wed Jan 21 16:28:15 2009 (r187536) +++ stable/6/sys/compat/freebsd32/syscalls.master Wed Jan 21 17:03:55 2009 (r187537) @@ -355,8 +355,8 @@ 195 AUE_SETRLIMIT MNOPROTO { int setrlimit(u_int which, \ struct rlimit *rlp); } setrlimit \ __setrlimit_args int -196 AUE_GETDIRENTRIES MNOPROTO { int getdirentries(int fd, char *buf, \ - u_int count, long *basep); } +196 AUE_GETDIRENTRIES MSTD { int freebsd32_getdirentries(int fd, \ + char *buf, u_int count, int32_t *basep); } 197 AUE_MMAP MSTD { caddr_t freebsd32_mmap(caddr_t addr, \ size_t len, int prot, int flags, int fd, \ int pad, u_int32_t poslo, \ Modified: stable/6/sys/kern/vfs_syscalls.c ============================================================================== --- stable/6/sys/kern/vfs_syscalls.c Wed Jan 21 16:28:15 2009 (r187536) +++ stable/6/sys/kern/vfs_syscalls.c Wed Jan 21 17:03:55 2009 (r187537) @@ -3688,6 +3688,21 @@ getdirentries(td, uap) long *basep; } */ *uap; { + long base; + int error; + + error = kern_getdirentries(td, uap->fd, uap->buf, uap->count, &base); + if (error) + return (error); + if (uap->basep != NULL) + error = copyout(&base, uap->basep, sizeof(long)); + return (error); +} + +int +kern_getdirentries(struct thread *td, int fd, char *buf, u_int count, + long *basep) +{ struct vnode *vp; struct file *fp; struct uio auio; @@ -3696,10 +3711,10 @@ getdirentries(td, uap) long loff; int error, eofflag; - AUDIT_ARG(fd, uap->fd); + AUDIT_ARG(fd, fd); if (uap->count > INT_MAX) return (EINVAL); - if ((error = getvnode(td->td_proc->p_fd, uap->fd, &fp)) != 0) + if ((error = getvnode(td->td_proc->p_fd, fd, &fp)) != 0) return (error); if ((fp->f_flag & FREAD) == 0) { fdrop(fp, td); @@ -3713,14 +3728,14 @@ unionread: error = EINVAL; goto fail; } - aiov.iov_base = uap->buf; - aiov.iov_len = uap->count; + aiov.iov_base = buf; + aiov.iov_len = count; auio.uio_iov = &aiov; auio.uio_iovcnt = 1; auio.uio_rw = UIO_READ; auio.uio_segflg = UIO_USERSPACE; auio.uio_td = td; - auio.uio_resid = uap->count; + auio.uio_resid = count; /* vn_lock(vp, LK_SHARED | LK_RETRY, td); */ vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); AUDIT_ARG(vnode, vp, ARG_VNODE1); @@ -3737,7 +3752,7 @@ unionread: VFS_UNLOCK_GIANT(vfslocked); goto fail; } - if (uap->count == auio.uio_resid && + if (count == auio.uio_resid && (vp->v_vflag & VV_ROOT) && (vp->v_mount->mnt_flag & MNT_UNION)) { struct vnode *tvp = vp; @@ -3752,10 +3767,8 @@ unionread: } VOP_UNLOCK(vp, 0, td); VFS_UNLOCK_GIANT(vfslocked); - if (uap->basep != NULL) { - error = copyout(&loff, uap->basep, sizeof(long)); - } - td->td_retval[0] = uap->count - auio.uio_resid; + *basep = loff; + td->td_retval[0] = count - auio.uio_resid; fail: fdrop(fp, td); return (error); Modified: stable/6/sys/sys/syscallsubr.h ============================================================================== --- stable/6/sys/sys/syscallsubr.h Wed Jan 21 16:28:15 2009 (r187536) +++ stable/6/sys/sys/syscallsubr.h Wed Jan 21 17:03:55 2009 (r187537) @@ -79,6 +79,8 @@ int kern_fstat(struct thread *td, int fd int kern_fstatfs(struct thread *td, int fd, struct statfs *buf); int kern_futimes(struct thread *td, int fd, struct timeval *tptr, enum uio_seg tptrseg); +int kern_getdirentries(struct thread *td, int fd, char *buf, u_int count, + long *basep); int kern_getfsstat(struct thread *td, struct statfs **buf, size_t bufsize, enum uio_seg bufseg, int flags); int kern_getitimer(struct thread *, u_int, struct itimerval *); From owner-svn-src-stable-6@FreeBSD.ORG Wed Jan 21 17:07:23 2009 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CB3D7106566B; Wed, 21 Jan 2009 17:07:23 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B7DFF8FC12; Wed, 21 Jan 2009 17:07:23 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0LH7NJA084038; Wed, 21 Jan 2009 17:07:23 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0LH7N6T084034; Wed, 21 Jan 2009 17:07:23 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <200901211707.n0LH7N6T084034@svn.freebsd.org> From: John Baldwin Date: Wed, 21 Jan 2009 17:07:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r187538 - stable/6/sys/compat/freebsd32 X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Jan 2009 17:07:25 -0000 Author: jhb Date: Wed Jan 21 17:07:23 2009 New Revision: 187538 URL: http://svn.freebsd.org/changeset/base/187538 Log: Regen. Modified: stable/6/sys/compat/freebsd32/freebsd32_proto.h stable/6/sys/compat/freebsd32/freebsd32_syscall.h stable/6/sys/compat/freebsd32/freebsd32_syscalls.c stable/6/sys/compat/freebsd32/freebsd32_sysent.c Modified: stable/6/sys/compat/freebsd32/freebsd32_proto.h ============================================================================== --- stable/6/sys/compat/freebsd32/freebsd32_proto.h Wed Jan 21 17:03:55 2009 (r187537) +++ stable/6/sys/compat/freebsd32/freebsd32_proto.h Wed Jan 21 17:07:23 2009 (r187538) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.50.2.16 2008/04/24 10:46:17 dfr Exp + * created from FreeBSD: stable/6/sys/compat/freebsd32/syscalls.master 187537 2009-01-21 17:03:55Z jhb */ #ifndef _FREEBSD32_SYSPROTO_H_ @@ -163,6 +163,12 @@ struct freebsd32_lstat_args { char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; char ub_l_[PADL_(struct stat32 *)]; struct stat32 * ub; char ub_r_[PADR_(struct stat32 *)]; }; +struct freebsd32_getdirentries_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char buf_l_[PADL_(char *)]; char * buf; char buf_r_[PADR_(char *)]; + char count_l_[PADL_(u_int)]; u_int count; char count_r_[PADR_(u_int)]; + char basep_l_[PADL_(int32_t *)]; int32_t * basep; char basep_r_[PADR_(int32_t *)]; +}; struct freebsd32_mmap_args { char addr_l_[PADL_(caddr_t)]; caddr_t addr; char addr_r_[PADR_(caddr_t)]; char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)]; @@ -349,6 +355,7 @@ int freebsd32_pwrite(struct thread *, st int freebsd32_stat(struct thread *, struct freebsd32_stat_args *); int freebsd32_fstat(struct thread *, struct freebsd32_fstat_args *); int freebsd32_lstat(struct thread *, struct freebsd32_lstat_args *); +int freebsd32_getdirentries(struct thread *, struct freebsd32_getdirentries_args *); int freebsd32_mmap(struct thread *, struct freebsd32_mmap_args *); int freebsd32_lseek(struct thread *, struct freebsd32_lseek_args *); int freebsd32_truncate(struct thread *, struct freebsd32_truncate_args *); Modified: stable/6/sys/compat/freebsd32/freebsd32_syscall.h ============================================================================== --- stable/6/sys/compat/freebsd32/freebsd32_syscall.h Wed Jan 21 17:03:55 2009 (r187537) +++ stable/6/sys/compat/freebsd32/freebsd32_syscall.h Wed Jan 21 17:07:23 2009 (r187538) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.50.2.16 2008/04/24 10:46:17 dfr Exp + * created from FreeBSD: stable/6/sys/compat/freebsd32/syscalls.master 187537 2009-01-21 17:03:55Z jhb */ #define FREEBSD32_SYS_syscall 0 @@ -177,7 +177,7 @@ #define FREEBSD32_SYS_fpathconf 192 #define FREEBSD32_SYS_getrlimit 194 #define FREEBSD32_SYS_setrlimit 195 -#define FREEBSD32_SYS_getdirentries 196 +#define FREEBSD32_SYS_freebsd32_getdirentries 196 #define FREEBSD32_SYS_freebsd32_mmap 197 #define FREEBSD32_SYS___syscall 198 #define FREEBSD32_SYS_freebsd32_lseek 199 Modified: stable/6/sys/compat/freebsd32/freebsd32_syscalls.c ============================================================================== --- stable/6/sys/compat/freebsd32/freebsd32_syscalls.c Wed Jan 21 17:03:55 2009 (r187537) +++ stable/6/sys/compat/freebsd32/freebsd32_syscalls.c Wed Jan 21 17:07:23 2009 (r187538) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.50.2.16 2008/04/24 10:46:17 dfr Exp + * created from FreeBSD: stable/6/sys/compat/freebsd32/syscalls.master 187537 2009-01-21 17:03:55Z jhb */ const char *freebsd32_syscallnames[] = { @@ -203,7 +203,7 @@ const char *freebsd32_syscallnames[] = { "#193", /* 193 = nosys */ "getrlimit", /* 194 = getrlimit */ "setrlimit", /* 195 = setrlimit */ - "getdirentries", /* 196 = getdirentries */ + "freebsd32_getdirentries", /* 196 = freebsd32_getdirentries */ "freebsd32_mmap", /* 197 = freebsd32_mmap */ "__syscall", /* 198 = __syscall */ "freebsd32_lseek", /* 199 = freebsd32_lseek */ Modified: stable/6/sys/compat/freebsd32/freebsd32_sysent.c ============================================================================== --- stable/6/sys/compat/freebsd32/freebsd32_sysent.c Wed Jan 21 17:03:55 2009 (r187537) +++ stable/6/sys/compat/freebsd32/freebsd32_sysent.c Wed Jan 21 17:07:23 2009 (r187538) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.50.2.16 2008/04/24 10:46:17 dfr Exp + * created from FreeBSD: stable/6/sys/compat/freebsd32/syscalls.master 187537 2009-01-21 17:03:55Z jhb */ #include "opt_compat.h" @@ -229,7 +229,7 @@ struct sysent freebsd32_sysent[] = { { 0, (sy_call_t *)nosys, AUE_NULL }, /* 193 = nosys */ { SYF_MPSAFE | AS(__getrlimit_args), (sy_call_t *)getrlimit, AUE_GETRLIMIT }, /* 194 = getrlimit */ { SYF_MPSAFE | AS(__setrlimit_args), (sy_call_t *)setrlimit, AUE_SETRLIMIT }, /* 195 = setrlimit */ - { SYF_MPSAFE | AS(getdirentries_args), (sy_call_t *)getdirentries, AUE_GETDIRENTRIES }, /* 196 = getdirentries */ + { SYF_MPSAFE | AS(freebsd32_getdirentries_args), (sy_call_t *)freebsd32_getdirentries, AUE_GETDIRENTRIES }, /* 196 = freebsd32_getdirentries */ { SYF_MPSAFE | AS(freebsd32_mmap_args), (sy_call_t *)freebsd32_mmap, AUE_MMAP }, /* 197 = freebsd32_mmap */ { SYF_MPSAFE | 0, (sy_call_t *)nosys, AUE_NULL }, /* 198 = __syscall */ { SYF_MPSAFE | AS(freebsd32_lseek_args), (sy_call_t *)freebsd32_lseek, AUE_LSEEK }, /* 199 = freebsd32_lseek */ From owner-svn-src-stable-6@FreeBSD.ORG Wed Jan 21 17:16:03 2009 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AE105106566B; Wed, 21 Jan 2009 17:16:03 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9BAE98FC18; Wed, 21 Jan 2009 17:16:03 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0LHG3kd084391; Wed, 21 Jan 2009 17:16:03 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0LHG3RG084390; Wed, 21 Jan 2009 17:16:03 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <200901211716.n0LHG3RG084390@svn.freebsd.org> From: John Baldwin Date: Wed, 21 Jan 2009 17:16:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r187541 - in stable/6/sys: . dev/mfi X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Jan 2009 17:16:04 -0000 Author: jhb Date: Wed Jan 21 17:16:03 2009 New Revision: 187541 URL: http://svn.freebsd.org/changeset/base/187541 Log: MFC: Fix the maximum transfer size for mfi(4) disk devices to not exceed the maximum number of scatter/gather elements supported in the bus dma tag. Modified: stable/6/sys/ (props changed) stable/6/sys/dev/mfi/mfi_disk.c Modified: stable/6/sys/dev/mfi/mfi_disk.c ============================================================================== --- stable/6/sys/dev/mfi/mfi_disk.c Wed Jan 21 17:13:31 2009 (r187540) +++ stable/6/sys/dev/mfi/mfi_disk.c Wed Jan 21 17:16:03 2009 (r187541) @@ -136,7 +136,8 @@ mfi_disk_attach(device_t dev) sc->ld_disk = disk_alloc(); sc->ld_disk->d_drv1 = sc; - sc->ld_disk->d_maxsize = sc->ld_controller->mfi_max_io * secsize; + sc->ld_disk->d_maxsize = min(sc->ld_controller->mfi_max_io * secsize, + (sc->ld_controller->mfi_max_sge - 1) * PAGE_SIZE); sc->ld_disk->d_name = "mfid"; sc->ld_disk->d_open = mfi_disk_open; sc->ld_disk->d_close = mfi_disk_close; From owner-svn-src-stable-6@FreeBSD.ORG Wed Jan 21 21:48:47 2009 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3376F106566B; Wed, 21 Jan 2009 21:48:47 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 21E928FC1A; Wed, 21 Jan 2009 21:48:47 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0LLmlhj092328; Wed, 21 Jan 2009 21:48:47 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0LLmlh0092327; Wed, 21 Jan 2009 21:48:47 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <200901212148.n0LLmlh0092327@svn.freebsd.org> From: John Baldwin Date: Wed, 21 Jan 2009 21:48:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r187575 - stable/6/sys/kern X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Jan 2009 21:48:48 -0000 Author: jhb Date: Wed Jan 21 21:48:46 2009 New Revision: 187575 URL: http://svn.freebsd.org/changeset/base/187575 Log: Fix build. Pointy hat to: jhb Modified: stable/6/sys/kern/vfs_syscalls.c Modified: stable/6/sys/kern/vfs_syscalls.c ============================================================================== --- stable/6/sys/kern/vfs_syscalls.c Wed Jan 21 21:31:44 2009 (r187574) +++ stable/6/sys/kern/vfs_syscalls.c Wed Jan 21 21:48:46 2009 (r187575) @@ -3712,7 +3712,7 @@ kern_getdirentries(struct thread *td, in int error, eofflag; AUDIT_ARG(fd, fd); - if (uap->count > INT_MAX) + if (count > INT_MAX) return (EINVAL); if ((error = getvnode(td->td_proc->p_fd, fd, &fp)) != 0) return (error); From owner-svn-src-stable-6@FreeBSD.ORG Thu Jan 22 18:45:12 2009 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0A756106568B; Thu, 22 Jan 2009 18:45:12 +0000 (UTC) (envelope-from schweikh@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id EACB18FC35; Thu, 22 Jan 2009 18:45:11 +0000 (UTC) (envelope-from schweikh@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0MIjB9r019687; Thu, 22 Jan 2009 18:45:11 GMT (envelope-from schweikh@svn.freebsd.org) Received: (from schweikh@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0MIjBp5019686; Thu, 22 Jan 2009 18:45:11 GMT (envelope-from schweikh@svn.freebsd.org) Message-Id: <200901221845.n0MIjBp5019686@svn.freebsd.org> From: Jens Schweikhardt Date: Thu, 22 Jan 2009 18:45:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r187596 - stable/6/share/man/man7 X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Jan 2009 18:45:15 -0000 Author: schweikh Date: Thu Jan 22 18:45:11 2009 New Revision: 187596 URL: http://svn.freebsd.org/changeset/base/187596 Log: MFC: Correct typo. PR: docs/129820 Submitted by: Marius Korsmo Modified: stable/6/share/man/man7/ports.7 Modified: stable/6/share/man/man7/ports.7 ============================================================================== --- stable/6/share/man/man7/ports.7 Thu Jan 22 18:43:46 2009 (r187595) +++ stable/6/share/man/man7/ports.7 Thu Jan 22 18:45:11 2009 (r187596) @@ -320,7 +320,7 @@ To find ports that contain in either of the name, path, info fields, ignore the rest of the record. .Pp -By default the search is not case-nsensitive. +By default the search is not case-sensitive. In order to make it case-sensitive you can use the .Va icase variable: