aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJung-uk Kim <jkim@FreeBSD.org>2012-01-09 23:20:30 +0000
committerJung-uk Kim <jkim@FreeBSD.org>2012-01-09 23:20:30 +0000
commitee5f87f4588609f6770138969c69d36b1c77abcf (patch)
treeb9c025c2f7453938771168e50ec14dab97c83566
parentc1ad3fcf6ab798c511b7e696d7656d41787d4241 (diff)
Notes
-rw-r--r--sys/conf/files.amd641
-rw-r--r--sys/dev/random/probe.c4
-rw-r--r--sys/modules/random/Makefile2
3 files changed, 4 insertions, 3 deletions
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index 79fb86c8a598..b396600861ee 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -215,6 +215,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
diff --git a/sys/dev/random/probe.c b/sys/dev/random/probe.c
index 264f9d594070..0bbfd95c68d8 100644
--- a/sys/dev/random/probe.c
+++ b/sys/dev/random/probe.c
@@ -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_systat *systat)
*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;
}
diff --git a/sys/modules/random/Makefile b/sys/modules/random/Makefile
index 37c4d829bc3b..746f45a9d787 100644
--- a/sys/modules/random/Makefile
+++ b/sys/modules/random/Makefile
@@ -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