Rename the IVY_RNG option to RDRAND_RNG.

Based on submission by:	Arthur Mesh <arthurmesh@gmail.com>
MFC after:	2 weeks

8 files changed, 9 insertions, 9 deletions

diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 95f9d9b..7aff1e8 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -293,7 +293,7 @@ device		wpi		# Intel 3945ABG wireless NICs.
 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.
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index 94639f2..6180341 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -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
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index c88ca0c..24d02a3 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -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
diff --git a/sys/conf/options.amd64 b/sys/conf/options.amd64
index 7db409c..90348b7 100644
--- a/sys/conf/options.amd64
+++ b/sys/conf/options.amd64
@@ -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
diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
index 9ce7b8c..059a637 100644
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -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
diff --git a/sys/dev/random/ivy.c b/sys/dev/random/ivy.c
index 3f9de2d..f81c148 100644
--- a/sys/dev/random/ivy.c
+++ b/sys/dev/random/ivy.c
@@ -30,7 +30,7 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_cpu.h"
 
-#ifdef IVY_RNG
+#ifdef RDRAND_RNG
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/sys/dev/random/probe.c b/sys/dev/random/probe.c
index 3edfe09..4558db7 100644
--- a/sys/dev/random/probe.c
+++ b/sys/dev/random/probe.c
@@ -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_systat *systat)
 			*systat = random_nehemiah;
 	}
 #endif
-#ifdef IVY_RNG
+#ifdef RDRAND_RNG
 	if (cpu_feature2 & CPUID2_RDRAND) {
 		int enable;
 
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 74829b8..f373599 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -306,7 +306,7 @@ device		wpi		# Intel 3945ABG wireless NICs.
 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.