bktr_core.c commit breaks building kernels on RELENG_5

Jon Noack noackjr at alumni.rice.edu
Sat Jan 15 22:58:20 PST 2005


This commit broke building kernels on RELENG_5 (see tinderbox logs):
> 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.
>   
>   Revision   Changes    Path
>   1.135.2.1  +65 -65    src/sys/dev/bktr/bktr_core.c

I believe this change was unintended:
> @@ -1258,7 +1258,7 @@ vbi_read(bktr_ptr_t bktr, struct uio *ui
>  	LOCK_VBI(bktr);
>  
>  	while(bktr->vbisize == 0) {
> -		if (ioflag & IO_NDELAY) {
> +		if (ioflag & FNDELAY) {
>  			status = EWOULDBLOCK;
>  			goto out;
>  		}

Jon


More information about the freebsd-stable mailing list