d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename the IVY_RNG option to RDRAND_RNG.

Browse Source 
Based on submission by:	Arthur Mesh <arthurmesh@gmail.com>
MFC after:	2 weeks
This commit is contained in:
Konstantin Belousov 2012-09-13 10:12:16 +00:00
parent 8a599c0859
commit c5e3d0ab11
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=240455
8 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/amd64/conf/GENERIC
View File

@ -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.

2
sys/conf/files.amd64
View File

@ -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

2
sys/conf/files.i386
View File

@ -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

2
sys/conf/options.amd64
View File

@ -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

2
sys/conf/options.i386
View File

@ -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

2
sys/dev/random/ivy.c
View File

@ -30,7 +30,7 @@ __FBSDID("$FreeBSD$");
#include "opt_cpu.h"
#ifdef IVY_RNG
#ifdef RDRAND_RNG
#include <sys/param.h>
#include <sys/time.h>

4
sys/dev/random/probe.c
View File

@ -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;

2
sys/i386/conf/GENERIC
View File

@ -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.