cvs commit: src/sys/dev/bktr bktr_core.c

[Warner Losh]

From: Sean Kelly <smkelly at FreeBSD.org>
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