Author: jkim
Date: Thu Feb 23 00:52:27 2012
New Revision: 232013
URL: http://svn.freebsd.org/changeset/base/232013
Log:
MFC: r229887
Enable hardware RNG for VIA Nano processors.
Modified:
stable/9/sys/conf/files.amd64
stable/9/sys/dev/random/probe.c
stable/9/sys/modules/random/Makefile
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/conf/ (props changed)
Modified: stable/9/sys/conf/files.amd64
==============================================================================
--- stable/9/sys/conf/files.amd64 Wed Feb 22 22:45:49 2012
(r232012)
+++ stable/9/sys/conf/files.amd64 Thu Feb 23 00:52:27 2012
(r232013)
@@ -216,6 +216,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/nehemiah.c optional random
dev/qlxgb/qla_dbg.c optional qlxgb pci
dev/qlxgb/qla_hw.c optional qlxgb pci
dev/qlxgb/qla_ioctl.c optional qlxgb pci
Modified: stable/9/sys/dev/random/probe.c
==============================================================================
--- stable/9/sys/dev/random/probe.c Wed Feb 22 22:45:49 2012
(r232012)
+++ stable/9/sys/dev/random/probe.c Thu Feb 23 00:52:27 2012
(r232013)
@@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$");
#include <sys/stdint.h>
#include <sys/sysctl.h>
-#if defined(__i386__) && !defined(PC98)
+#if defined(__amd64__) || (defined(__i386__) && !defined(PC98))
#include <machine/cpufunc.h>
#include <machine/cputypes.h>
#include <machine/md_var.h>
@@ -55,7 +55,7 @@ random_ident_hardware(struct random_syst
*systat = random_yarrow;
/* Then go looking for hardware */
-#if defined(__i386__) && !defined(PC98)
+#if defined(__amd64__) || (defined(__i386__) && !defined(PC98))
if (via_feature_rng & VIA_HAS_RNG) {
*systat = random_nehemiah;
}
Modified: stable/9/sys/modules/random/Makefile
==============================================================================
--- stable/9/sys/modules/random/Makefile Wed Feb 22 22:45:49 2012
(r232012)
+++ stable/9/sys/modules/random/Makefile Thu Feb 23 00:52:27 2012
(r232013)
@@ -6,7 +6,7 @@
KMOD= random
SRCS= randomdev.c probe.c
-.if ${MACHINE} == "i386"
+.if ${MACHINE} == "amd64" || ${MACHINE} == "i386"
SRCS+= nehemiah.c
.endif
SRCS+= randomdev_soft.c yarrow.c hash.c
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
