diff options
author | David E. O'Brien <obrien@FreeBSD.org> | 2013-08-21 22:43:29 +0000 |
---|---|---|
committer | David E. O'Brien <obrien@FreeBSD.org> | 2013-08-21 22:43:29 +0000 |
commit | 46be218dce25ebb5739446f6bc9a453f3593186f (patch) | |
tree | b54931a7385946ad975f464fdbf8d4341fcd6a4c /sys/amd64 | |
parent | 1533b9f714b1e23a650a2524d2e57d256a100f4c (diff) | |
download | src-46be218dce25ebb5739446f6bc9a453f3593186f.tar.gz src-46be218dce25ebb5739446f6bc9a453f3593186f.zip |
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
Notes
Notes:
svn path=/head/; revision=254624
Diffstat (limited to 'sys/amd64')
-rw-r--r-- | sys/amd64/conf/GENERIC | 4 | ||||
-rw-r--r-- | sys/amd64/conf/NOTES | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 3068a8a09f95..08865a8d388e 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 7d585410213c..95d4ce052cd2 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: |