From owner-svn-src-all@FreeBSD.ORG Thu Sep 27 10:41:35 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1FE10106564A; Thu, 27 Sep 2012 10:41:35 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E48298FC15; Thu, 27 Sep 2012 10:41:34 +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 q8RAfYQA099566; Thu, 27 Sep 2012 10:41:34 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8RAfYJ6099561; Thu, 27 Sep 2012 10:41:34 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201209271041.q8RAfYJ6099561@svn.freebsd.org> From: Konstantin Belousov Date: Thu, 27 Sep 2012 10:41:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r240991 - in stable/8/sys: conf dev/random modules/random X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Sep 2012 10:41:35 -0000 Author: kib Date: Thu Sep 27 10:41:34 2012 New Revision: 240991 URL: http://svn.freebsd.org/changeset/base/240991 Log: MFC r229887 (by jkim): Enable hardware RNG for VIA Nano processors. Modified: stable/8/sys/conf/files.amd64 stable/8/sys/dev/random/probe.c stable/8/sys/modules/random/Makefile Directory Properties: stable/8/sys/ (props changed) stable/8/sys/dev/ (props changed) stable/8/sys/dev/random/ (props changed) stable/8/sys/modules/ (props changed) Modified: stable/8/sys/conf/files.amd64 ============================================================================== --- stable/8/sys/conf/files.amd64 Thu Sep 27 10:30:11 2012 (r240990) +++ stable/8/sys/conf/files.amd64 Thu Sep 27 10:41:34 2012 (r240991) @@ -223,6 +223,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/sio/sio.c optional sio dev/sio/sio_isa.c optional sio isa dev/sio/sio_pccard.c optional sio pccard Modified: stable/8/sys/dev/random/probe.c ============================================================================== --- stable/8/sys/dev/random/probe.c Thu Sep 27 10:30:11 2012 (r240990) +++ stable/8/sys/dev/random/probe.c Thu Sep 27 10:41:34 2012 (r240991) @@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$"); #include #include -#if defined(__i386__) && !defined(PC98) +#if defined(__amd64__) || (defined(__i386__) && !defined(PC98)) #include #include #include @@ -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/8/sys/modules/random/Makefile ============================================================================== --- stable/8/sys/modules/random/Makefile Thu Sep 27 10:30:11 2012 (r240990) +++ stable/8/sys/modules/random/Makefile Thu Sep 27 10:41:34 2012 (r240991) @@ -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