summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2013-08-21 22:43:29 +0000
committerobrien <obrien@FreeBSD.org>2013-08-21 22:43:29 +0000
commitb450ec770a8a78fee6639c0bef791019f5457921 (patch)
treeb54931a7385946ad975f464fdbf8d4341fcd6a4c
parentf4e86b0a9fd4200d38de9fd26806c1c04125456d (diff)
downloadFreeBSD-src-b450ec770a8a78fee6639c0bef791019f5457921.zip
FreeBSD-src-b450ec770a8a78fee6639c0bef791019f5457921.tar.gz
The PADLOCK_RNG and RDRAND_RNG kernel options are now devices.
Thus "device padlock_rng" and "device rdrand_rng" should be used instead of "options PADLOCK_RNG" & "options RDRAND_RNG". Requested by: so@ (des) Submitted by: obrien, arthurmesh@gmail.com Obtained from: Juniper Networks
-rw-r--r--UPDATING9
-rw-r--r--sys/amd64/conf/GENERIC4
-rw-r--r--sys/amd64/conf/NOTES2
-rw-r--r--sys/conf/options.amd644
-rw-r--r--sys/conf/options.i3864
-rw-r--r--sys/i386/conf/GENERIC4
-rw-r--r--sys/i386/conf/NOTES2
7 files changed, 15 insertions, 14 deletions
diff --git a/UPDATING b/UPDATING
index 86d140d..c0f23b4 100644
--- a/UPDATING
+++ b/UPDATING
@@ -31,6 +31,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10.x IS SLOW:
disable the most expensive debugging functionality run
"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
+20130821:
+ The PADLOCK_RNG and RDRAND_RNG kernel options are now devices.
+ Thus "device padlock_rng" and "device rdrand_rng" should be
+ used instead of "options PADLOCK_RNG" & "options RDRAND_RNG".
+
20130813:
WITH_ICONV has been split into two feature sets. WITH_ICONV now
enables just the iconv* functionality and is now on by default.
@@ -340,9 +345,9 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10.x IS SLOW:
20120913:
The random(4) support for the VIA hardware random number
generator (`PADLOCK') is no longer enabled unconditionally.
- Add the PADLOCK_RNG option in the custom kernel config if
+ Add the padlock_rng device in the custom kernel config if
needed. The GENERIC kernels on i386 and amd64 do include the
- option, so the change only affects the custom kernel
+ device, so the change only affects the custom kernel
configurations.
20120908:
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 3068a8a0..08865a8 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -293,8 +293,8 @@ device wpi # Intel 3945ABG wireless NICs.
# Pseudo devices.
device loop # Network loopback
device random # Entropy device
-options PADLOCK_RNG # VIA Padlock RNG
-options RDRAND_RNG # Intel Bull Mountain RNG
+device padlock_rng # VIA Padlock RNG
+device rdrand_rng # Intel Bull Mountain RNG
device ether # Ethernet support
device vlan # 802.1Q VLAN support
device tun # Packet tunnel.
diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES
index 7d58541..95d4ce0 100644
--- a/sys/amd64/conf/NOTES
+++ b/sys/amd64/conf/NOTES
@@ -496,6 +496,8 @@ device vpd
device asmc
#device si
device tpm
+device padlock_rng # VIA Padlock RNG
+device rdrand_rng # Intel Bull Mountain RNG
#
# Laptop/Notebook options:
diff --git a/sys/conf/options.amd64 b/sys/conf/options.amd64
index 90348b7..31d1650 100644
--- a/sys/conf/options.amd64
+++ b/sys/conf/options.amd64
@@ -68,7 +68,3 @@ XENHVM opt_global.h
# options for the Intel C600 SAS driver (isci)
ISCI_LOGGING opt_isci.h
-
-# hw random number generators for random(4)
-PADLOCK_RNG opt_cpu.h
-RDRAND_RNG opt_cpu.h
diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
index 059a637..3638266 100644
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -123,7 +123,3 @@ XENHVM opt_global.h
# options for the Intel C600 SAS driver (isci)
ISCI_LOGGING opt_isci.h
-
-# hw random number generators for random(4)
-PADLOCK_RNG opt_cpu.h
-RDRAND_RNG opt_cpu.h
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 7e8bb90..5e6bfd5 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -307,8 +307,8 @@ device wpi # Intel 3945ABG wireless NICs.
# Pseudo devices.
device loop # Network loopback
device random # Entropy device
-options PADLOCK_RNG # VIA Padlock RNG
-options RDRAND_RNG # Intel Bull Mountain RNG
+device padlock_rng # VIA Padlock RNG
+device rdrand_rng # Intel Bull Mountain RNG
device ether # Ethernet support
device vlan # 802.1Q VLAN support
device tun # Packet tunnel.
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 36744ab..3cb1264 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -850,6 +850,8 @@ hint.spic.0.port="0x10a0"
device asmc
#device si
device tpm
+device padlock_rng # VIA Padlock RNG
+device rdrand_rng # Intel Bull Mountain RNG
#
# Laptop/Notebook options:
OpenPOWER on IntegriCloud