Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev Be naughty and avoid #ifdef __HAVE_CPU_COUNTER in ru...



details:   https://anonhg.NetBSD.org/src/rev/c9cd78715d3c
branches:  trunk
changeset: 747292:c9cd78715d3c
user:      pooka <pooka%NetBSD.org@localhost>
date:      Tue Sep 08 20:07:35 2009 +0000

description:
Be naughty and avoid #ifdef __HAVE_CPU_COUNTER in rump -- it's a
massively MD can of purpleworms.

diffstat:

 sys/dev/rnd.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r dd94d85df6e2 -r c9cd78715d3c sys/dev/rnd.c
--- a/sys/dev/rnd.c     Tue Sep 08 20:04:03 2009 +0000
+++ b/sys/dev/rnd.c     Tue Sep 08 20:07:35 2009 +0000
@@ -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



Home | Main Index | Thread Index | Old Index