[src/netbsd-7]: src/sys/kern Pull up following revision(s) (requested by chri...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ebfdca3fc929
branches:  netbsd-7
changeset: 798807:ebfdca3fc929
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Jan 09 14:06:55 2015 +0000

description:
Pull up following revision(s) (requested by christos in ticket #397):
        sys/kern/kern_rndq.c: revision 1.29
PR 49104: Jarle Greipsland: Don't use cpu_counter32() unconditionally.
PR 49124: Soekris net4501 panics during boot after merge of "tls-earlyentropy" to HEAD

diffstat:

 sys/kern/kern_rndq.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r c269845e3dfa -r ebfdca3fc929 sys/kern/kern_rndq.c
--- a/sys/kern/kern_rndq.c      Fri Jan 09 10:34:02 2015 +0000
+++ b/sys/kern/kern_rndq.c      Fri Jan 09 14:06:55 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_rndq.c,v 1.26.2.2 2014/11/02 09:47:04 martin Exp $        */
+/*     $NetBSD: kern_rndq.c,v 1.26.2.3 2015/01/09 14:06:55 martin Exp $        */
 
 /*-
  * Copyright (c) 1997-2013 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_rndq.c,v 1.26.2.2 2014/11/02 09:47:04 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_rndq.c,v 1.26.2.3 2015/01/09 14:06:55 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/atomic.h>
@@ -222,7 +222,8 @@
        uint32_t ret;
 
 #if defined(__HAVE_CPU_COUNTER)
-       return (cpu_counter32());
+       if (cpu_hascounter())
+               return cpu_counter32();
 #endif
        if (rnd_ready) {
                nanouptime(&ts);