Mon Apr 17 06:57:02 2023 UTC ()
(missed in pervious commit)

Rename VM_KERNEL_IO_ADDRESS to VM_KERNEL_IO_BASE to match RISC-V

It's less letters, matches other similar variables and will help with
sharing code between the two architectures.

NFCI.


(skrll)
diff -r1.5 -r1.6 src/external/cddl/osnet/dev/dtrace/aarch64/dtrace_subr.c
cvs diff -r1.5 -r1.6 src/external/cddl/osnet/dev/dtrace/aarch64/dtrace_subr.c (expand / switch to unified diff)

--- src/external/cddl/osnet/dev/dtrace/aarch64/dtrace_subr.c 2021/04/06 12:48:36 1.5
+++ src/external/cddl/osnet/dev/dtrace/aarch64/dtrace_subr.c 2023/04/17 06:57:02 1.6
@@ -18,27 +18,27 @@ @@ -18,27 +18,27 @@
18 * information: Portions Copyright [yyyy] [name of copyright owner] 18 * information: Portions Copyright [yyyy] [name of copyright owner]
19 * 19 *
20 * CDDL HEADER END 20 * CDDL HEADER END
21 * 21 *
22 * $FreeBSD$ 22 * $FreeBSD$
23 * 23 *
24 */ 24 */
25/* 25/*
26 * Copyright 2005 Sun Microsystems, Inc. All rights reserved. 26 * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
27 * Use is subject to license terms. 27 * Use is subject to license terms.
28 */ 28 */
29 29
30#include <sys/cdefs.h> 30#include <sys/cdefs.h>
31__KERNEL_RCSID(0, "$NetBSD: dtrace_subr.c,v 1.5 2021/04/06 12:48:36 simonb Exp $"); 31__KERNEL_RCSID(0, "$NetBSD: dtrace_subr.c,v 1.6 2023/04/17 06:57:02 skrll Exp $");
32 32
33#include <sys/param.h> 33#include <sys/param.h>
34#include <sys/systm.h> 34#include <sys/systm.h>
35#include <sys/types.h> 35#include <sys/types.h>
36#include <sys/kernel.h> 36#include <sys/kernel.h>
37#include <sys/malloc.h> 37#include <sys/malloc.h>
38#include <sys/kmem.h> 38#include <sys/kmem.h>
39#include <sys/xcall.h> 39#include <sys/xcall.h>
40#include <sys/cpu.h> 40#include <sys/cpu.h>
41#include <sys/cpuvar.h> 41#include <sys/cpuvar.h>
42#include <sys/dtrace_impl.h> 42#include <sys/dtrace_impl.h>
43#include <sys/dtrace_bsd.h> 43#include <sys/dtrace_bsd.h>
44#include <machine/cpu.h> 44#include <machine/cpu.h>
@@ -119,27 +119,27 @@ dtrace_invop_remove(int (*func)(uintptr_ @@ -119,27 +119,27 @@ dtrace_invop_remove(int (*func)(uintptr_
119 ASSERT(dtrace_invop_hdlr != hdlr); 119 ASSERT(dtrace_invop_hdlr != hdlr);
120 prev->dtih_next = hdlr->dtih_next; 120 prev->dtih_next = hdlr->dtih_next;
121 } 121 }
122 122
123 kmem_free(hdlr, sizeof(*hdlr)); 123 kmem_free(hdlr, sizeof(*hdlr));
124} 124}
125 125
126/*ARGSUSED*/ 126/*ARGSUSED*/
127void 127void
128dtrace_toxic_ranges(void (*func)(uintptr_t base, uintptr_t limit)) 128dtrace_toxic_ranges(void (*func)(uintptr_t base, uintptr_t limit))
129{ 129{
130 130
131 (*func)(0, (uintptr_t)AARCH64_DIRECTMAP_START); 131 (*func)(0, (uintptr_t)AARCH64_DIRECTMAP_START);
132 (*func)((uintptr_t)VM_KERNEL_IO_ADDRESS, ~(uintptr_t)0); 132 (*func)((uintptr_t)VM_KERNEL_IO_BASE, ~(uintptr_t)0);
133} 133}
134 134
135static void 135static void
136xcall_func(void *arg0, void *arg1) 136xcall_func(void *arg0, void *arg1)
137{ 137{
138 dtrace_xcall_t func = arg0; 138 dtrace_xcall_t func = arg0;
139 139
140 (*func)(arg1); 140 (*func)(arg1);
141} 141}
142 142
143void 143void
144dtrace_xcall(processorid_t cpu, dtrace_xcall_t func, void *arg) 144dtrace_xcall(processorid_t cpu, dtrace_xcall_t func, void *arg)
145{ 145{