Date: Wed, 12 Sep 2012 08:49:41 -0700 From: Arthur Mesh <arthurmesh@gmail.com> To: Konstantin Belousov <kostikbel@gmail.com> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r240135 - in head/sys: amd64/conf conf dev/random i386/conf modules/random Message-ID: <20120912154941.GG14077@x96.org> In-Reply-To: <20120912043302.GN37286@deviant.kiev.zoral.com.ua> References: <20120911205345.GD14077@x96.org> <20120912043302.GN37286@deviant.kiev.zoral.com.ua>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, Sep 12, 2012 at 07:33:02AM +0300, Konstantin Belousov wrote:
> Can you submit the desired patch ?
Sure,
Index: sys/i386/conf/GENERIC
===================================================================
--- sys/i386/conf/GENERIC (revision 240406)
+++ sys/i386/conf/GENERIC (working copy)
@@ -306,7 +306,7 @@
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.
Index: sys/dev/random/probe.c
===================================================================
--- sys/dev/random/probe.c (revision 240406)
+++ sys/dev/random/probe.c (working copy)
@@ -55,7 +55,7 @@
#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 @@
*systat = random_nehemiah;
}
#endif
-#ifdef IVY_RNG
+#ifdef RDRAND_RNG
if (cpu_feature2 & CPUID2_RDRAND) {
int enable;
Index: sys/dev/random/ivy.c
===================================================================
--- sys/dev/random/ivy.c (revision 240406)
+++ sys/dev/random/ivy.c (working copy)
@@ -30,7 +30,7 @@
#include "opt_cpu.h"
-#ifdef IVY_RNG
+#ifdef RDRAND_RNG
#include <sys/param.h>
#include <sys/time.h>
Index: sys/conf/options.amd64
===================================================================
--- sys/conf/options.amd64 (revision 240406)
+++ sys/conf/options.amd64 (working copy)
@@ -71,4 +71,4 @@
# hw random number generators for random(4)
PADLOCK_RNG opt_cpu.h
-IVY_RNG opt_cpu.h
+RDRAND_RNG opt_cpu.h
Index: sys/conf/options.i386
===================================================================
--- sys/conf/options.i386 (revision 240406)
+++ sys/conf/options.i386 (working copy)
@@ -126,4 +126,4 @@
# hw random number generators for random(4)
PADLOCK_RNG opt_cpu.h
-IVY_RNG opt_cpu.h
+RDRAND_RNG opt_cpu.h
Index: sys/amd64/conf/GENERIC
===================================================================
--- sys/amd64/conf/GENERIC (revision 240406)
+++ sys/amd64/conf/GENERIC (working copy)
@@ -293,7 +293,7 @@
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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120912154941.GG14077>