CVS commit: src/sys/kern

[Antti Kantee]

Module Name:    src
Committed By:   pooka
Date:           Tue Mar 11 20:26:08 UTC 2014

Modified Files:
        src/sys/kern: kern_rndq.c

Log Message:
kill undesirable "#ifdef _RUMPKERNEL"


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 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.22 src/sys/kern/kern_rndq.c:1.23
--- src/sys/kern/kern_rndq.c:1.22	Tue Feb 25 23:15:43 2014
+++ src/sys/kern/kern_rndq.c	Tue Mar 11 20:26:08 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_rndq.c,v 1.22 2014/02/25 23:15:43 riastradh Exp $	*/
+/*	$NetBSD: kern_rndq.c,v 1.23 2014/03/11 20:26:08 pooka 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.22 2014/02/25 23:15:43 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_rndq.c,v 1.23 2014/03/11 20:26:08 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/ioctl.h>
@@ -58,7 +58,7 @@ __KERNEL_RCSID(0, "$NetBSD: kern_rndq.c,
 
 #include <dev/rnd_private.h>
 
-#if defined(__HAVE_CPU_COUNTER) && !defined(_RUMPKERNEL) /* XXX: bad pooka */
+#if defined(__HAVE_CPU_COUNTER)
 #include <machine/cpu_counter.h>
 #endif
 
@@ -183,7 +183,7 @@ rnd_counter(void)
 {
 	struct timeval tv;
 
-#if defined(__HAVE_CPU_COUNTER) && !defined(_RUMPKERNEL) /* XXX: bad pooka */
+#if defined(__HAVE_CPU_COUNTER)
 	if (cpu_hascounter())
 		return (cpu_counter32());
 #endif
@@ -329,7 +329,7 @@ rnd_estimate_entropy(krndsource_t *rs, u
 	return (1);
 }
 
-#if defined(__HAVE_CPU_COUNTER) && !defined(_RUMPKERNEL)
+#if defined(__HAVE_CPU_COUNTER)
 static void
 rnd_skew(void *arg)
 {
@@ -432,7 +432,7 @@ rnd_init(void)
 	 * XXX clocking the callout mechanism.  How to get this right
 	 * XXX without unsightly spelunking in the timecounter code?
 	 */
-#if defined(__HAVE_CPU_COUNTER) && !defined(_RUMPKERNEL) /* XXX: bad pooka */
+#if defined(__HAVE_CPU_COUNTER)
 	callout_init(&skew_callout, CALLOUT_MPSAFE);
 	callout_setfunc(&skew_callout, rnd_skew, NULL);
 	rnd_skew(NULL);