Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kill undesirable "#ifdef _RUMPKERNEL"

This commit is contained in:
pooka 2014-03-11 20:26:08 +00:00
parent 98631d955a
commit b05633df66
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/kern/kern_rndq.c
View File

@ -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,v 1.22 2014/02/25 23:15:43 riastradh Exp
#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_int32_t t)
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);