From owner-cvs-src@FreeBSD.ORG Sun Apr 1 06:58:01 2007 Return-Path: X-Original-To: cvs-src@FreeBSD.org Delivered-To: cvs-src@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5095716A401; Sun, 1 Apr 2007 06:58:01 +0000 (UTC) (envelope-from kris@obsecurity.org) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.freebsd.org (Postfix) with ESMTP id 3839B13C45A; Sun, 1 Apr 2007 06:58:01 +0000 (UTC) (envelope-from kris@obsecurity.org) Received: from obsecurity.dyndns.org (elvis.mu.org [192.203.228.196]) by elvis.mu.org (Postfix) with ESMTP id 17D8D1A4DAC; Sat, 31 Mar 2007 23:58:01 -0700 (PDT) Received: by obsecurity.dyndns.org (Postfix, from userid 1000) id 5A94D517E2; Sun, 1 Apr 2007 02:58:00 -0400 (EDT) Date: Sun, 1 Apr 2007 02:58:00 -0400 From: Kris Kennaway To: Colin Percival Message-ID: <20070401065800.GA94710@xor.obsecurity.org> References: <20070401042209.8F13F51E4D@repoman.freebsd.org> <460F4541.5060006@freebsd.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="gKMricLos+KVdGMg" Content-Disposition: inline In-Reply-To: <460F4541.5060006@freebsd.org> User-Agent: Mutt/1.4.2.2i Cc: cvs-src@FreeBSD.org, Kris Kennaway , src-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/sys/amd64/amd64 busdma_machdep.c mem.c mp_watchdog.c pmap.c trap.c src/sys/amd64/conf GENERIC src/sys/amd64/isa isa_dma.c src/sys/arm/arm busdma_machdep.c mem.c pmap.c src/sys/arm/xscale/i80321 i80321_aau.c i80321_dma.c ... X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Apr 2007 06:58:01 -0000 --gKMricLos+KVdGMg Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Mar 31, 2007 at 10:38:09PM -0700, Colin Percival wrote: > Kris Kennaway wrote: > > Log: > > Final stage of SMP pushdown: rename the Giant lock to the Midget lock. > > ... > > 1.118 +2 -2 src/sys/pci/if_vr.c >=20 > This doesn't look quite right: >=20 > > --- if_vr.c 23 Feb 2007 12:19:03 -0000 1.117 > > +++ if_vr.c 1 Apr 2007 04:21:44 -0000 1.118 > > @@ -982,8 +982,8 @@ > > printf(" frame alignment error\n"); > > if (rxstat & VR_RXSTAT_FIFOOFLOW) > > printf(" FIFO overflow"); > > - if (rxstat & VR_RXSTAT_GIANT) > > - printf(" received giant packet"); > > + if (rxstat & VR_RXSTAT_MIDGET) > > + printf(" received midget packet"); > > if (rxstat & VR_RXSTAT_RUNT) > > printf(" received runt packet"); > > if (rxstat & VR_RXSTAT_BUSERR) Oops, I'll fix that later today. I also accidentally took a file off the vendor branch too :( Hopefully the CVS admins can repair that to avoid complicating future imports. Kris --gKMricLos+KVdGMg Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (FreeBSD) iD8DBQFGD1f3Wry0BWjoQKURAuILAKDBNTc6mkhTQyUlhMyjTv7iSGJ+QACcDZRt X9G/ahjGymd9DzfpHVxP6pE= =RnNt -----END PGP SIGNATURE----- --gKMricLos+KVdGMg--