[src/trunk]: src/sys/kern kill undesirable "#ifdef _RUMPKERNEL"

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

details:   https://anonhg.NetBSD.org/src/rev/6cc73e062e1c
branches:  trunk
changeset: 327577:6cc73e062e1c
user:      pooka <pooka%NetBSD.org@localhost>
date:      Tue Mar 11 20:26:08 2014 +0000

description:
kill undesirable "#ifdef _RUMPKERNEL"

diffstat:

 sys/kern/kern_rndq.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r 78a8f983beec -r 6cc73e062e1c sys/kern/kern_rndq.c
--- a/sys/kern/kern_rndq.c      Tue Mar 11 20:25:05 2014 +0000
+++ b/sys/kern/kern_rndq.c      Tue Mar 11 20:26:08 2014 +0000
@@ -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 @@
 
 #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 @@
 {
        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 @@
        return (1);
 }
 
-#if defined(__HAVE_CPU_COUNTER) && !defined(_RUMPKERNEL)
+#if defined(__HAVE_CPU_COUNTER)
 static void
 rnd_skew(void *arg)
 {
@@ -432,7 +432,7 @@
         * 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);