Date: Tue, 8 Sep 2015 08:50:29 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r287558 - in head/sys: conf sys Message-ID: <201509080850.t888oT8k083447@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509080850.t888oT8k083447>