D3486.id.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D3486.id.diff
View Options

	Index: head/sys/conf/options
	===================================================================
	--- head/sys/conf/options
	+++ head/sys/conf/options
	@@ -947,11 +947,11 @@
	# 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
	Index: head/sys/sys/random.h
	===================================================================
	--- head/sys/sys/random.h
	+++ head/sys/sys/random.h
	@@ -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"