Module Name: src
Committed By: pooka
Date: Tue Sep 8 20:07:35 UTC 2009
Modified Files:
src/sys/dev: rnd.c
Log Message:
Be naughty and avoid #ifdef __HAVE_CPU_COUNTER in rump -- it's a
massively MD can of purpleworms.
To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 src/sys/dev/rnd.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/dev/rnd.c
diff -u src/sys/dev/rnd.c:1.72 src/sys/dev/rnd.c:1.73
--- src/sys/dev/rnd.c:1.72 Tue May 5 21:03:29 2009
+++ src/sys/dev/rnd.c Tue Sep 8 20:07:35 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rnd.c,v 1.72 2009/05/05 21:03:29 elad Exp $ */
+/* $NetBSD: rnd.c,v 1.73 2009/09/08 20:07:35 pooka Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rnd.c,v 1.72 2009/05/05 21:03:29 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rnd.c,v 1.73 2009/09/08 20:07:35 pooka Exp $");
#include <sys/param.h>
#include <sys/ioctl.h>
@@ -178,7 +178,7 @@
{
struct timeval tv;
-#ifdef __HAVE_CPU_COUNTER
+#if defined(__HAVE_CPU_COUNTER) && !defined(_RUMPKERNEL) /* XXX: bad pooka */
if (cpu_hascounter())
return (cpu_counter32());
#endif
