From owner-cvs-src@FreeBSD.ORG Mon Jan 17 04:29:13 2005 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B913A16A4CE; Mon, 17 Jan 2005 04:29:13 +0000 (GMT) Received: from harmony.village.org (rover.village.org [168.103.84.182]) by mx1.FreeBSD.org (Postfix) with ESMTP id 33ACB43D4C; Mon, 17 Jan 2005 04:29:13 +0000 (GMT) (envelope-from imp@harmony.village.org) Received: from localhost (localhost [IPv6:::1]) by harmony.village.org (8.13.1/8.13.1) with ESMTP id j0H4RJHx037709; Sun, 16 Jan 2005 21:27:19 -0700 (MST) (envelope-from imp@harmony.village.org) Date: Sun, 16 Jan 2005 21:27:18 -0700 (MST) Message-Id: <20050116.212718.74715734.imp@harmony.village.org> To: smkelly@FreeBSD.org From: Warner Losh In-Reply-To: <20050116104942.GA39032@edgemaster.zombie.org> References: <200501160101.j0G11FdX014832@repoman.freebsd.org> <20050116104942.GA39032@edgemaster.zombie.org> X-Mailer: Mew version 3.3 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit cc: cvs-src@FreeBSD.org cc: src-committers@FreeBSD.org cc: cognet@FreeBSD.org cc: cvs-all@FreeBSD.org Subject: Re: cvs commit: src/sys/dev/bktr bktr_core.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 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: Mon, 17 Jan 2005 04:29:14 -0000 From: Sean Kelly Subject: Re: cvs commit: src/sys/dev/bktr bktr_core.c Date: Sun, 16 Jan 2005 04:49:42 -0600 > On Sun, Jan 16, 2005 at 01:01:15AM +0000, Olivier Houchard wrote: > > cognet 2005-01-16 01:01:15 UTC > > > > FreeBSD src repository > > > > Modified files: (Branch: RELENG_5) > > sys/dev/bktr bktr_core.c > > Log: > > MFC rev 1.139: > > revision 1.138 > > date: 2005/01/09 17:42:03; author: cognet; state: Exp; lines: +64 -64 > > Use uint32_t instead of u_long when appropriate. > > That's enough to make my bt848 work on amd64. > > --- src/sys/dev/bktr/bktr_core.c 2004/06/16 09:46:38 1.135 > +++ src/sys/dev/bktr/bktr_core.c 2005/01/16 01:01:14 1.135.2.1 > ... > - if (ioflag & IO_NDELAY) { > + if (ioflag & FNDELAY) { > ... > > This broke my RELENG_5 build. I'd debug it more, but it is approaching 5AM > and only bad things would come of it. It shouldn't have been MFC'd, I don't think, because IO_NDELAY is the right way in 5.x. Warner