Author: kib
Date: Thu Sep 13 10:12:16 2012
New Revision: 240455
URL: http://svn.freebsd.org/changeset/base/240455
Log:
Rename the IVY_RNG option to RDRAND_RNG.
Based on submission by: Arthur Mesh <arthurm...@gmail.com>
MFC after: 2 weeks
Modified:
head/sys/amd64/conf/GENERIC
head/sys/conf/files.amd64
head/sys/conf/files.i386
head/sys/conf/options.amd64
head/sys/conf/options.i386
head/sys/dev/random/ivy.c
head/sys/dev/random/probe.c
head/sys/i386/conf/GENERIC
Modified: head/sys/amd64/conf/GENERIC
==============================================================================
--- head/sys/amd64/conf/GENERIC Thu Sep 13 10:11:40 2012 (r240454)
+++ head/sys/amd64/conf/GENERIC Thu Sep 13 10:12:16 2012 (r240455)
@@ -293,7 +293,7 @@ device wpi # Intel 3945ABG
wireless NI
device loop # Network loopback
device random # Entropy device
options PADLOCK_RNG # VIA Padlock RNG
-options IVY_RNG # Intel Bull Mountain RNG
+options RDRAND_RNG # Intel Bull Mountain RNG
device ether # Ethernet support
device vlan # 802.1Q VLAN support
device tun # Packet tunnel.
Modified: head/sys/conf/files.amd64
==============================================================================
--- head/sys/conf/files.amd64 Thu Sep 13 10:11:40 2012 (r240454)
+++ head/sys/conf/files.amd64 Thu Sep 13 10:12:16 2012 (r240455)
@@ -214,7 +214,7 @@ dev/lindev/lindev.c optional lindev
dev/nfe/if_nfe.c optional nfe pci
dev/nve/if_nve.c optional nve pci
dev/nvram/nvram.c optional nvram isa
-dev/random/ivy.c optional random ivy_rng
+dev/random/ivy.c optional random rdrand_rng
dev/random/nehemiah.c optional random padlock_rng
dev/qlxgb/qla_dbg.c optional qlxgb pci
dev/qlxgb/qla_hw.c optional qlxgb pci
Modified: head/sys/conf/files.i386
==============================================================================
--- head/sys/conf/files.i386 Thu Sep 13 10:11:40 2012 (r240454)
+++ head/sys/conf/files.i386 Thu Sep 13 10:12:16 2012 (r240455)
@@ -227,7 +227,7 @@ dev/nfe/if_nfe.c optional nfe pci
dev/nve/if_nve.c optional nve pci
dev/nvram/nvram.c optional nvram isa
dev/pcf/pcf_isa.c optional pcf
-dev/random/ivy.c optional random ivy_rng
+dev/random/ivy.c optional random rdrand_rng
dev/random/nehemiah.c optional random padlock_rng
dev/sbni/if_sbni.c optional sbni
dev/sbni/if_sbni_isa.c optional sbni isa
Modified: head/sys/conf/options.amd64
==============================================================================
--- head/sys/conf/options.amd64 Thu Sep 13 10:11:40 2012 (r240454)
+++ head/sys/conf/options.amd64 Thu Sep 13 10:12:16 2012 (r240455)
@@ -71,4 +71,4 @@ ISCI_LOGGING opt_isci.h
# hw random number generators for random(4)
PADLOCK_RNG opt_cpu.h
-IVY_RNG opt_cpu.h
+RDRAND_RNG opt_cpu.h
Modified: head/sys/conf/options.i386
==============================================================================
--- head/sys/conf/options.i386 Thu Sep 13 10:11:40 2012 (r240454)
+++ head/sys/conf/options.i386 Thu Sep 13 10:12:16 2012 (r240455)
@@ -126,4 +126,4 @@ ISCI_LOGGING opt_isci.h
# hw random number generators for random(4)
PADLOCK_RNG opt_cpu.h
-IVY_RNG opt_cpu.h
+RDRAND_RNG opt_cpu.h
Modified: head/sys/dev/random/ivy.c
==============================================================================
--- head/sys/dev/random/ivy.c Thu Sep 13 10:11:40 2012 (r240454)
+++ head/sys/dev/random/ivy.c Thu Sep 13 10:12:16 2012 (r240455)
@@ -30,7 +30,7 @@ __FBSDID("$FreeBSD$");
#include "opt_cpu.h"
-#ifdef IVY_RNG
+#ifdef RDRAND_RNG
#include <sys/param.h>
#include <sys/time.h>
Modified: head/sys/dev/random/probe.c
==============================================================================
--- head/sys/dev/random/probe.c Thu Sep 13 10:11:40 2012 (r240454)
+++ head/sys/dev/random/probe.c Thu Sep 13 10:12:16 2012 (r240455)
@@ -55,7 +55,7 @@ __FBSDID("$FreeBSD$");
#ifdef PADLOCK_RNG
extern struct random_systat random_nehemiah;
#endif
-#ifdef IVY_RNG
+#ifdef RDRAND_RNG
extern struct random_systat random_ivy;
#endif
#endif
@@ -79,7 +79,7 @@ random_ident_hardware(struct random_syst
*systat = random_nehemiah;
}
#endif
-#ifdef IVY_RNG
+#ifdef RDRAND_RNG
if (cpu_feature2 & CPUID2_RDRAND) {
int enable;
Modified: head/sys/i386/conf/GENERIC
==============================================================================
--- head/sys/i386/conf/GENERIC Thu Sep 13 10:11:40 2012 (r240454)
+++ head/sys/i386/conf/GENERIC Thu Sep 13 10:12:16 2012 (r240455)
@@ -306,7 +306,7 @@ device wpi # Intel 3945ABG
wireless NI
device loop # Network loopback
device random # Entropy device
options PADLOCK_RNG # VIA Padlock RNG
-options IVY_RNG # Intel Bull Mountain RNG
+options RDRAND_RNG # Intel Bull Mountain RNG
device ether # Ethernet support
device vlan # 802.1Q VLAN support
device tun # Packet tunnel.
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
