From owner-svn-src-all@freebsd.org  Tue Sep  8 08:50:29 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 BC806A00B06;
 Tue,  8 Sep 2015 08:50:29 +0000 (UTC)
 (envelope-from ngie@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 ADA7D13BE;
 Tue,  8 Sep 2015 08:50:29 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t888oT7b083449;
 Tue, 8 Sep 2015 08:50:29 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t888oT8k083447;
 Tue, 8 Sep 2015 08:50:29 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201509080850.t888oT8k083447@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Tue, 8 Sep 2015 08:50:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r287558 - in head/sys: conf sys
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: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 08 Sep 2015 08:50:29 -0000

Author: ngie
Date: Tue Sep  8 08:50:28 2015
New Revision: 287558
URL: https://svnweb.freebsd.org/changeset/base/287558

Log:
  Remove opt_random.h header pollution from sys/random.h by moving
  RANDOM_LOADABLE and RANDOM_YARROW's definitions from opt_random.h to
  opt_global.h
  
  This unbreaks `make depend` in sys/modules with multiple drivers (tmpfs, etc)
  after r286839
  
  X-MFC with: r286839
  Reviewed by: imp
  Submitted by: lwhsu
  Differential Revision: D3486

Modified:
  head/sys/conf/options
  head/sys/sys/random.h

Modified: head/sys/conf/options
==============================================================================
--- head/sys/conf/options	Tue Sep  8 08:48:53 2015	(r287557)
+++ head/sys/conf/options	Tue Sep  8 08:50:28 2015	(r287558)
@@ -947,11 +947,11 @@ RCTL		opt_global.h
 # Random number generator(s)
 # Which CSPRNG hash we get.
 # If Yarrow is not chosen, Fortuna is selected.
-RANDOM_YARROW	opt_random.h
+RANDOM_YARROW	opt_global.h
 # With this, no entropy processor is loaded, but the entropy
 # harvesting infrastructure is present. This means an entropy
 # processor may be loaded as a module.
-RANDOM_LOADABLE	opt_random.h
+RANDOM_LOADABLE	opt_global.h
 # This turns on high-rate and potentially expensive harvesting in
 # the uma slab allocator.
 RANDOM_ENABLE_UMA	opt_global.h

Modified: head/sys/sys/random.h
==============================================================================
--- head/sys/sys/random.h	Tue Sep  8 08:48:53 2015	(r287557)
+++ head/sys/sys/random.h	Tue Sep  8 08:50:28 2015	(r287558)
@@ -33,8 +33,6 @@
 
 #include <sys/types.h>
 
-#include "opt_random.h"
-
 #if !defined(KLD_MODULE)
 #if defined(RANDOM_LOADABLE) && defined(RANDOM_YARROW)
 #error "Cannot define both RANDOM_LOADABLE and RANDOM_YARROW"