From owner-svn-src-all@freebsd.org  Tue Jul 14 20:45:25 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9CAE89A1691;
 Tue, 14 Jul 2015 20:45:25 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8D2AF1EF8;
 Tue, 14 Jul 2015 20:45:25 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6EKjPm5039051;
 Tue, 14 Jul 2015 20:45:25 GMT (envelope-from ed@FreeBSD.org)
Received: (from ed@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6EKjP3J039050;
 Tue, 14 Jul 2015 20:45:25 GMT (envelope-from ed@FreeBSD.org)
Message-Id: <201507142045.t6EKjP3J039050@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ed set sender to ed@FreeBSD.org
 using -f
From: Ed Schouten <ed@FreeBSD.org>
Date: Tue, 14 Jul 2015 20:45:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r285573 - head/sys/dev/random
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 14 Jul 2015 20:45:25 -0000

Author: ed
Date: Tue Jul 14 20:45:24 2015
New Revision: 285573
URL: https://svnweb.freebsd.org/changeset/base/285573

Log:
  Fix the build after breaking it in r285549.
  
  I performed the commit on a different system as where I wrote the
  change. After pulling in the change from Phabricator, I didn't notice
  that a single chunk did not apply.
  
  Approved by:	secteam (implicit, as intended change was approved)
  Pointy hat to:	me

Modified:
  head/sys/dev/random/randomdev.c

Modified: head/sys/dev/random/randomdev.c
==============================================================================
--- head/sys/dev/random/randomdev.c	Tue Jul 14 20:10:41 2015	(r285572)
+++ head/sys/dev/random/randomdev.c	Tue Jul 14 20:45:24 2015	(r285573)
@@ -168,7 +168,7 @@ read_random_uio(struct uio *uio, bool no
 	/* (Un)Blocking logic */
 	error = 0;
 	while (!random_alg_context.ra_seeded()) {
-		if (flags & O_NONBLOCK)	{
+		if (nonblock) {
 			error = EWOULDBLOCK;
 			break;
 		}