From owner-freebsd-stable@FreeBSD.ORG  Sun Jan 16 06:58:20 2005
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
Delivered-To: freebsd-stable@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id BB2A116A4E2
	for <stable@freebsd.org>; Sun, 16 Jan 2005 06:58:20 +0000 (GMT)
Received: from smtp815.mail.sc5.yahoo.com (smtp815.mail.sc5.yahoo.com
	[66.163.170.1])	by mx1.FreeBSD.org (Postfix) with SMTP id 6854243D49
	for <stable@freebsd.org>; Sun, 16 Jan 2005 06:58:20 +0000 (GMT)
	(envelope-from noackjr@alumni.rice.edu)
Received: from unknown (HELO optimator.noacks.org)
	(noacks@swbell.net@70.240.249.100 with login)
	by smtp815.mail.sc5.yahoo.com with SMTP; 16 Jan 2005 06:58:20 -0000
Received: from localhost (localhost [127.0.0.1])
	by optimator.noacks.org (Postfix) with ESMTP id 59986622B;
	Sun, 16 Jan 2005 00:58:19 -0600 (CST)
Received: from optimator.noacks.org ([127.0.0.1])
 by localhost (optimator.noacks.org [127.0.0.1]) (amavisd-new, port 10024)
 with LMTP id 50161-09; Sun, 16 Jan 2005 00:58:16 -0600 (CST)
Received: from compgeek.noacks.org (compgeek [192.168.1.10])
	by optimator.noacks.org (Postfix) with ESMTP id 5662D6215;
	Sun, 16 Jan 2005 00:58:16 -0600 (CST)
Received: from [127.0.0.1] (localhost [127.0.0.1])
	by compgeek.noacks.org (8.13.1/8.13.1) with ESMTP id j0G6wFer089752;
	Sun, 16 Jan 2005 00:58:15 -0600 (CST)
	(envelope-from noackjr@alumni.rice.edu)
Message-ID: <41EA1087.6090008@alumni.rice.edu>
Date: Sun, 16 Jan 2005 00:58:15 -0600
From: Jon Noack <noackjr@alumni.rice.edu>
User-Agent: Mozilla Thunderbird 1.0 (X11/20050103)
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: cognet@freebsd.org
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
X-Virus-Scanned: amavisd-new at noacks.org
cc: stable@freebsd.org
Subject: bktr_core.c commit breaks building kernels on RELENG_5
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
Reply-To: noackjr@alumni.rice.edu
List-Id: Production branch of FreeBSD source code
	<freebsd-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
	<mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable>
List-Post: <mailto:freebsd-stable@freebsd.org>
List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
	<mailto:freebsd-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 Jan 2005 06:58:20 -0000

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