Back out r253779 & r253786.

5 files changed, 11 insertions, 45 deletions

diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 71794fc..bd263e9 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -254,7 +254,6 @@ SUBDIR=	\
 	${_opensolaris} \
 	oce \
 	${_padlock} \
-	${_padlock_rng} \
 	patm \
 	${_pccard} \
 	${_pcfclock} \
@@ -281,7 +280,6 @@ SUBDIR=	\
 	${_random} \
 	rc4 \
 	${_rdma} \
-	${_rdrand_rng} \
 	re \
 	reiserfs \
 	rl \
@@ -365,14 +363,11 @@ SUBDIR=	\
 	${_x86bios} \
 	${_xe} \
 	xl \
-	yarrow_rng \
 	${_zfs} \
 	zlib \
 
 .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
 _filemon=	filemon
-_padlock_rng=	padlock_rng
-_rdrand_rng=	rdrand_rng
 .endif
 
 .if ${MACHINE_CPUARCH} != "powerpc" && ${MACHINE_CPUARCH} != "arm" && \
diff --git a/sys/modules/padlock_rng/Makefile b/sys/modules/padlock_rng/Makefile
deleted file mode 100644
index 5c96c20..0000000
--- a/sys/modules/padlock_rng/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../../dev/random
-
-KMOD=	padlock_rng
-
-SRCS+=	\
-	nehemiah.c
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/random/Makefile b/sys/modules/random/Makefile
index a4882ba..ad14899 100644
--- a/sys/modules/random/Makefile
+++ b/sys/modules/random/Makefile
@@ -1,9 +1,19 @@
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../dev/random
+.PATH: ${.CURDIR}/../../crypto/rijndael
+.PATH: ${.CURDIR}/../../crypto/sha2
 
 KMOD=	random
 SRCS=	randomdev.c probe.c
-SRCS+=	bus_if.h device_if.h opt_cpu.h
+.if ${MACHINE} == "amd64" || ${MACHINE} == "i386"
+SRCS+=	nehemiah.c
+SRCS+=	ivy.c
+.endif
+SRCS+=	randomdev_soft.c yarrow.c hash.c
+SRCS+=	rijndael-alg-fst.c rijndael-api-fst.c sha2.c
+SRCS+=	bus_if.h device_if.h vnode_if.h opt_cpu.h
+
+CFLAGS+= -I${.CURDIR}/../..
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/rdrand_rng/Makefile b/sys/modules/rdrand_rng/Makefile
deleted file mode 100644
index 2cfd3fd..0000000
--- a/sys/modules/rdrand_rng/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../../dev/random
-
-KMOD=	rdrand_rng
-
-SRCS+=	\
-	ivy.c
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/yarrow_rng/Makefile b/sys/modules/yarrow_rng/Makefile
deleted file mode 100644
index 0974cba..0000000
--- a/sys/modules/yarrow_rng/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../../dev/random
-.PATH: ${.CURDIR}/../../crypto/rijndael
-
-KMOD=	yarrow_rng
-
-SRCS+=	\
-	hash.c \
-	randomdev_soft.c \
-	rijndael-alg-fst.c \
-	rijndael-api-fst.c \
-	yarrow.c
-
-SRCS+=	bus_if.h device_if.h
-
-CFLAGS+= -I${.CURDIR}/../..
-
-.include <bsd.kmod.mk>