Author: obrien
Date: Wed Aug 21 22:43:29 2013
New Revision: 254624
URL: http://svnweb.freebsd.org/changeset/base/254624

Log:
  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, arthurm...@gmail.com
  Obtained from:        Juniper Networks

Modified:
  head/UPDATING
  head/sys/amd64/conf/GENERIC
  head/sys/amd64/conf/NOTES
  head/sys/conf/options.amd64
  head/sys/conf/options.i386
  head/sys/i386/conf/GENERIC
  head/sys/i386/conf/NOTES

Modified: head/UPDATING
==============================================================================
--- head/UPDATING       Wed Aug 21 22:40:29 2013        (r254623)
+++ head/UPDATING       Wed Aug 21 22:43:29 2013        (r254624)
@@ -31,6 +31,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10
        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
 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:

Modified: head/sys/amd64/conf/GENERIC
==============================================================================
--- head/sys/amd64/conf/GENERIC Wed Aug 21 22:40:29 2013        (r254623)
+++ head/sys/amd64/conf/GENERIC Wed Aug 21 22:43:29 2013        (r254624)
@@ -293,8 +293,8 @@ device              wpi             # Intel 3945ABG 
wireless NI
 # 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.

Modified: head/sys/amd64/conf/NOTES
==============================================================================
--- head/sys/amd64/conf/NOTES   Wed Aug 21 22:40:29 2013        (r254623)
+++ head/sys/amd64/conf/NOTES   Wed Aug 21 22:43:29 2013        (r254624)
@@ -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:

Modified: head/sys/conf/options.amd64
==============================================================================
--- head/sys/conf/options.amd64 Wed Aug 21 22:40:29 2013        (r254623)
+++ head/sys/conf/options.amd64 Wed Aug 21 22:43:29 2013        (r254624)
@@ -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

Modified: head/sys/conf/options.i386
==============================================================================
--- head/sys/conf/options.i386  Wed Aug 21 22:40:29 2013        (r254623)
+++ head/sys/conf/options.i386  Wed Aug 21 22:43:29 2013        (r254624)
@@ -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

Modified: head/sys/i386/conf/GENERIC
==============================================================================
--- head/sys/i386/conf/GENERIC  Wed Aug 21 22:40:29 2013        (r254623)
+++ head/sys/i386/conf/GENERIC  Wed Aug 21 22:43:29 2013        (r254624)
@@ -307,8 +307,8 @@ device              wpi             # Intel 3945ABG 
wireless NI
 # 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.

Modified: head/sys/i386/conf/NOTES
==============================================================================
--- head/sys/i386/conf/NOTES    Wed Aug 21 22:40:29 2013        (r254623)
+++ head/sys/i386/conf/NOTES    Wed Aug 21 22:43:29 2013        (r254624)
@@ -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:
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to