From owner-svn-src-stable@FreeBSD.ORG  Thu Feb 23 00:52:27 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E4A86106566B;
	Thu, 23 Feb 2012 00:52:27 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B97AC8FC27;
	Thu, 23 Feb 2012 00:52:27 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q1N0qRB9076380;
	Thu, 23 Feb 2012 00:52:27 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1N0qR7e076376;
	Thu, 23 Feb 2012 00:52:27 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201202230052.q1N0qR7e076376@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Thu, 23 Feb 2012 00:52:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r232013 - in stable/9/sys: conf dev/random
	modules/random
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Feb 2012 00:52:28 -0000

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