From 46be218dce25ebb5739446f6bc9a453f3593186f Mon Sep 17 00:00:00 2001 From: "David E. O'Brien" Date: Wed, 21 Aug 2013 22:43:29 +0000 Subject: 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 --- sys/amd64/conf/GENERIC | 4 ++-- sys/amd64/conf/NOTES | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'sys/amd64') 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: -- cgit v1.2.3