From owner-svn-src-stable@FreeBSD.ORG Fri Aug 14 21:35:25 2009 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A1E591065795; Fri, 14 Aug 2009 21:35:25 +0000 (UTC) (envelope-from rnoland@FreeBSD.org) Received: from gizmo.2hip.net (gizmo.2hip.net [64.74.207.195]) by mx1.freebsd.org (Postfix) with ESMTP id 494A98FC59; Fri, 14 Aug 2009 21:35:25 +0000 (UTC) Received: from [192.168.1.4] (adsl-1-120-225.bna.bellsouth.net [65.1.120.225]) (authenticated bits=0) by gizmo.2hip.net (8.14.3/8.14.3) with ESMTP id n7ELZMLB098504 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 14 Aug 2009 17:35:23 -0400 (EDT) (envelope-from rnoland@FreeBSD.org) From: Robert Noland To: Nick Hibma In-Reply-To: <200908142107.n7EL7fGl047798@svn.freebsd.org> References: <200908142107.n7EL7fGl047798@svn.freebsd.org> Content-Type: text/plain Organization: FreeBSD Date: Fri, 14 Aug 2009 16:35:17 -0500 Message-Id: <1250285717.21931.0.camel@balrog.2hip.net> Mime-Version: 1.0 X-Mailer: Evolution 2.26.3 FreeBSD GNOME Team Port Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-1.5 required=5.0 tests=AWL,BAYES_00,RCVD_IN_PBL, RCVD_IN_SORBS_DUL, RDNS_DYNAMIC, SPF_SOFTFAIL autolearn=no version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on gizmo.2hip.net Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-7@freebsd.org Subject: Re: svn commit: r196225 - stable/7/sys/pci X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Aug 2009 21:35:25 -0000 On Fri, 2009-08-14 at 21:07 +0000, Nick Hibma wrote: > Author: n_hibma > Date: Fri Aug 14 21:07:41 2009 > New Revision: 196225 > URL: http://svn.freebsd.org/changeset/base/196225 > > Log: > Revert r196169. Thanks, robert. > Modified: > stable/7/sys/pci/agp_i810.c > > Modified: stable/7/sys/pci/agp_i810.c > ============================================================================== > --- stable/7/sys/pci/agp_i810.c Fri Aug 14 21:05:08 2009 (r196224) > +++ stable/7/sys/pci/agp_i810.c Fri Aug 14 21:07:41 2009 (r196225) > @@ -474,13 +474,12 @@ agp_i810_attach(device_t dev) > agp_generic_detach(dev); > return EINVAL; > } > - > - if (bootverbose) { > - device_print_prettyname(dev); > - if (sc->stolen > 0) > - printf("detected %dk stolen memory, ", sc->stolen * 4); > - printf("aperture size is %dM\n", sc->initial_aperture / 1024 / 1024); > + if (sc->stolen > 0) { > + device_printf(dev, "detected %dk stolen memory\n", > + sc->stolen * 4); > } > + device_printf(dev, "aperture size is %dM\n", > + sc->initial_aperture / 1024 / 1024); > > /* GATT address is already in there, make sure it's enabled */ > pgtblctl = bus_read_4(sc->sc_res[0], AGP_I810_PGTBL_CTL); > @@ -665,13 +664,9 @@ agp_i810_attach(device_t dev) > gtt_size += 4; > > sc->stolen = (stolen - gtt_size) * 1024 / 4096; > - > - if (bootverbose) { > - device_print_prettyname(dev); > - if (sc->stolen > 0) > - printf("detected %dk stolen memory, ", sc->stolen * 4); > - printf("aperture size is %dM\n", sc->initial_aperture / 1024 / 1024); > - } > + if (sc->stolen > 0) > + device_printf(dev, "detected %dk stolen memory\n", sc->stolen * 4); > + device_printf(dev, "aperture size is %dM\n", sc->initial_aperture / 1024 / 1024); > > /* GATT address is already in there, make sure it's enabled */ > pgtblctl = bus_read_4(sc->sc_res[0], AGP_I810_PGTBL_CTL); -- Robert Noland FreeBSD