Module Name: src
Committed By: martin
Date: Fri Jan 9 14:06:55 UTC 2015
Modified Files:
src/sys/kern [netbsd-7]: kern_rndq.c
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.26.2.2 -r1.26.2.3 src/sys/kern/kern_rndq.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_rndq.c
diff -u src/sys/kern/kern_rndq.c:1.26.2.2 src/sys/kern/kern_rndq.c:1.26.2.3
--- src/sys/kern/kern_rndq.c:1.26.2.2 Sun Nov 2 09:47:04 2014
+++ src/sys/kern/kern_rndq.c Fri Jan 9 14:06:55 2015
@@ -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 @@ rnd_counter(void)
uint32_t ret;
#if defined(__HAVE_CPU_COUNTER)
- return (cpu_counter32());
+ if (cpu_hascounter())
+ return cpu_counter32();
#endif
if (rnd_ready) {
nanouptime(&ts);
