Module Name: src
Committed By: pooka
Date: Tue May 11 21:03:41 UTC 2010
Modified Files:
src/sys/rump/librump/rumpkern/arch/i386: Makefile.inc
src/sys/rump/librump/rumpkern/arch/x86_64: Makefile.inc
Added Files:
src/sys/rump/librump/rumpkern/arch/i386: cpu_counter.c
Log Message:
add __HAVE_CPU_COUNTER stubs where possible (i.e. where the arch
doesn't think inlines are the second compiling)
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/librump/rumpkern/arch/i386/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/sys/rump/librump/rumpkern/arch/i386/cpu_counter.c
cvs rdiff -u -r1.4 -r1.5 \
src/sys/rump/librump/rumpkern/arch/x86_64/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpkern/arch/i386/Makefile.inc
diff -u src/sys/rump/librump/rumpkern/arch/i386/Makefile.inc:1.3 src/sys/rump/librump/rumpkern/arch/i386/Makefile.inc:1.4
--- src/sys/rump/librump/rumpkern/arch/i386/Makefile.inc:1.3 Thu Jan 1 19:07:43 2009
+++ src/sys/rump/librump/rumpkern/arch/i386/Makefile.inc Tue May 11 21:03:41 2010
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.inc,v 1.3 2009/01/01 19:07:43 pooka Exp $
+# $NetBSD: Makefile.inc,v 1.4 2010/05/11 21:03:41 pooka Exp $
#
-SRCS+= rumpcpu.c rumpspl.c
+SRCS+= rumpcpu.c rumpspl.c cpu_counter.c
.PATH: ${RUMPTOP}/../arch/i386/i386
SRCS+= kobj_machdep.c
Index: src/sys/rump/librump/rumpkern/arch/x86_64/Makefile.inc
diff -u src/sys/rump/librump/rumpkern/arch/x86_64/Makefile.inc:1.4 src/sys/rump/librump/rumpkern/arch/x86_64/Makefile.inc:1.5
--- src/sys/rump/librump/rumpkern/arch/x86_64/Makefile.inc:1.4 Thu Jan 1 20:30:45 2009
+++ src/sys/rump/librump/rumpkern/arch/x86_64/Makefile.inc Tue May 11 21:03:41 2010
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.inc,v 1.4 2009/01/01 20:30:45 pooka Exp $
+# $NetBSD: Makefile.inc,v 1.5 2010/05/11 21:03:41 pooka Exp $
#
.PATH: ${ARCHDIR}/../i386
-SRCS+= rumpcpu.c rumpspl.c
+SRCS+= rumpcpu.c rumpspl.c cpu_counter.c
.PATH: ${RUMPTOP}/../arch/amd64/amd64
SRCS+= kobj_machdep.c
Added files:
Index: src/sys/rump/librump/rumpkern/arch/i386/cpu_counter.c
diff -u /dev/null src/sys/rump/librump/rumpkern/arch/i386/cpu_counter.c:1.1
--- /dev/null Tue May 11 21:03:41 2010
+++ src/sys/rump/librump/rumpkern/arch/i386/cpu_counter.c Tue May 11 21:03:41 2010
@@ -0,0 +1,66 @@
+/* $NetBSD: cpu_counter.c,v 1.1 2010/05/11 21:03:41 pooka Exp $ */
+
+/*
+ * Copyright (c) 2010 Antti Kantee. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
+ * __HAVE_CPU_COUNTER stubs. It would be nice to have this
+ * MI, but need MD for now because of inline-happy archs.
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: cpu_counter.c,v 1.1 2010/05/11 21:03:41 pooka Exp $");
+
+#include <sys/param.h>
+
+#include <x86/cpu_counter.h>
+
+int
+cpu_hascounter(void)
+{
+
+ return 0;
+}
+
+uint64_t
+cpu_counter(void)
+{
+
+ return 0;
+}
+
+uint32_t
+cpu_counter32(void)
+{
+
+ return 0;
+}
+
+uint64_t
+cpu_frequency(struct cpu_info *ci)
+{
+
+ return 0;
+}
