Module Name: src
Committed By: tron
Date: Thu Mar 18 11:00:03 UTC 2010
Modified Files:
src/external/cddl/osnet/dev/dtrace/i386: dtrace_subr.c
Log Message:
Fix the build:
1.) "ifdef-out" unused functions and global variables.
2.) Include "x86/include/cpu_counter.h" for amd64 and i386 to get the
prototype of "cpu_frequency".
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/cddl/osnet/dev/dtrace/i386/dtrace_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dev/dtrace/i386/dtrace_subr.c
diff -u src/external/cddl/osnet/dev/dtrace/i386/dtrace_subr.c:1.2 src/external/cddl/osnet/dev/dtrace/i386/dtrace_subr.c:1.3
--- src/external/cddl/osnet/dev/dtrace/i386/dtrace_subr.c:1.2 Sun Feb 21 01:46:33 2010
+++ src/external/cddl/osnet/dev/dtrace/i386/dtrace_subr.c Thu Mar 18 11:00:03 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: dtrace_subr.c,v 1.2 2010/02/21 01:46:33 darran Exp $ */
+/* $NetBSD: dtrace_subr.c,v 1.3 2010/03/18 11:00:03 tron Exp $ */
/*
* CDDL HEADER START
@@ -48,6 +48,10 @@
#include <uvm/uvm_prot.h>
#include <uvm/uvm_pmap.h>
+#if defined(__amd64__) || defined(__i386__)
+#include <x86/include/cpu_counter.h>
+#endif
+
extern uintptr_t kernelbase;
extern uintptr_t dtrace_in_probe_addr;
extern int dtrace_in_probe;
@@ -61,6 +65,8 @@
dtrace_invop_hdlr_t *dtrace_invop_hdlr;
+void dtrace_gethrtime_init(void *arg);
+
int
dtrace_invop(uintptr_t addr, uintptr_t *stack, uintptr_t eax)
{
@@ -372,8 +378,10 @@
}
#endif
+#if 0
static int64_t tgt_cpu_tsc;
static int64_t hst_cpu_tsc;
+#endif
static int64_t tsc_skew[MAXCPUS];
static uint64_t nsec_scale;
@@ -389,6 +397,7 @@
return (rv);
}
+#if 0
static void
dtrace_gethrtime_init_sync(void *arg)
{
@@ -408,7 +417,9 @@
}
#endif
}
+#endif
+#if 0
static void
dtrace_gethrtime_init_cpu(void *arg)
{
@@ -419,6 +430,7 @@
else
hst_cpu_tsc = dtrace_rdtsc();
}
+#endif
void
dtrace_gethrtime_init(void *arg)
