Module Name: src
Committed By: christos
Date: Thu Aug 16 14:14:52 UTC 2018
Modified Files:
src/external/cddl/osnet/dev/dtrace/amd64: dtrace_isa.c dtrace_subr.c
Log Message:
get rid of kernelbase
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/external/cddl/osnet/dev/dtrace/amd64/dtrace_isa.c
cvs rdiff -u -r1.10 -r1.11 \
src/external/cddl/osnet/dev/dtrace/amd64/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/amd64/dtrace_isa.c
diff -u src/external/cddl/osnet/dev/dtrace/amd64/dtrace_isa.c:1.9 src/external/cddl/osnet/dev/dtrace/amd64/dtrace_isa.c:1.10
--- src/external/cddl/osnet/dev/dtrace/amd64/dtrace_isa.c:1.9 Sun Aug 12 12:07:27 2018
+++ src/external/cddl/osnet/dev/dtrace/amd64/dtrace_isa.c Thu Aug 16 10:14:51 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: dtrace_isa.c,v 1.9 2018/08/12 16:07:27 christos Exp $ */
+/* $NetBSD: dtrace_isa.c,v 1.10 2018/08/16 14:14:51 christos Exp $ */
/*
* CDDL HEADER START
@@ -45,12 +45,6 @@ uint16_t dtrace_fuword16_nocheck(void *)
uint32_t dtrace_fuword32_nocheck(void *);
uint64_t dtrace_fuword64_nocheck(void *);
-#ifdef VM_MIN_KERNEL_ADDRESS_DEFAULT
-__strong_alias(kernelbase, vm_min_kernel_address)
-#else
-uintptr_t kernelbase = (uintptr_t)VM_MIN_KERNEL_ADDRESS;
-#endif
-
#define INKERNEL(va) ((intptr_t)(va) < 0) /* XXX horror */
struct amd64_frame {
Index: src/external/cddl/osnet/dev/dtrace/amd64/dtrace_subr.c
diff -u src/external/cddl/osnet/dev/dtrace/amd64/dtrace_subr.c:1.10 src/external/cddl/osnet/dev/dtrace/amd64/dtrace_subr.c:1.11
--- src/external/cddl/osnet/dev/dtrace/amd64/dtrace_subr.c:1.10 Tue Jun 5 08:04:19 2018
+++ src/external/cddl/osnet/dev/dtrace/amd64/dtrace_subr.c Thu Aug 16 10:14:51 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: dtrace_subr.c,v 1.10 2018/06/05 12:04:19 christos Exp $ */
+/* $NetBSD: dtrace_subr.c,v 1.11 2018/08/16 14:14:51 christos Exp $ */
/*
* CDDL HEADER START
@@ -48,8 +48,6 @@
#include <machine/cpu_counter.h>
#include <machine/cpufunc.h>
-extern uintptr_t kernelbase;
-
int dtrace_invop(uintptr_t, struct trapframe *, uintptr_t);
typedef struct dtrace_invop_hdlr {
@@ -117,7 +115,7 @@ dtrace_invop_remove(int (*func)(uintptr_
void
dtrace_toxic_ranges(void (*func)(uintptr_t base, uintptr_t limit))
{
- (*func)(0, kernelbase);
+ (*func)(0, VM_MIN_KERNEL_ADDRESS);
}
static void
