aboutsummaryrefslogtreecommitdiff
path: root/sys/conf
diff options
context:
space:
mode:
authorEnji Cooper <ngie@FreeBSD.org>2015-09-08 08:50:28 +0000
committerEnji Cooper <ngie@FreeBSD.org>2015-09-08 08:50:28 +0000
commit7afd9bf059688692e2a841a7b7d7e97b3621f045 (patch)
treeba5d5daa0f19eacf18c9378fb64c73874e45195e /sys/conf
parentb684727b0766e75a30b7a165ddd89b93e168a880 (diff)
downloadsrc-7afd9bf059688692e2a841a7b7d7e97b3621f045.tar.gz
src-7afd9bf059688692e2a841a7b7d7e97b3621f045.zip
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
Notes
Notes: svn path=/head/; revision=287558
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/options4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/conf/options b/sys/conf/options
index 936abc95a229..ccbbd800c3cf 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -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