Page MenuHomeFreeBSD
Files F144605248

D12227.1775706516.diff
No OneTemporary
Actions

Size
3 KB
Referenced Files
None
Subscribers
None

D12227.1775706516.diff
View Options

Index: sys/cddl/dev/dtrace/mips/dtrace_asm.S
===================================================================
--- sys/cddl/dev/dtrace/mips/dtrace_asm.S
+++ sys/cddl/dev/dtrace/mips/dtrace_asm.S
@@ -37,8 +37,6 @@
#include <machine/cpuregs.h>
#include <machine/regnum.h>
-#include "assym.s"
-
.set noreorder # Noreorder is default style!
/*
Index: sys/cddl/dev/dtrace/mips/dtrace_subr.c
===================================================================
--- sys/cddl/dev/dtrace/mips/dtrace_subr.c
+++ sys/cddl/dev/dtrace/mips/dtrace_subr.c
@@ -50,6 +50,8 @@
extern dtrace_id_t dtrace_probeid_error;
int dtrace_invop(uintptr_t, struct trapframe *, uintptr_t);
+void dtrace_invop_init(void);
+void dtrace_invop_uninit(void);
typedef struct dtrace_invop_hdlr {
int (*dtih_func)(uintptr_t, struct trapframe *, uintptr_t);
Index: sys/cddl/dev/fbt/mips/fbt_isa.c
===================================================================
--- sys/cddl/dev/fbt/mips/fbt_isa.c
+++ sys/cddl/dev/fbt/mips/fbt_isa.c
@@ -82,7 +82,6 @@
linker_symval_t *symval, void *opaque)
{
fbt_probe_t *fbt, *retfbt;
- uint32_t *target, *start;
uint32_t *instr, *limit;
const char *name;
char *modname;
Index: sys/mips/conf/ERL
===================================================================
--- sys/mips/conf/ERL
+++ sys/mips/conf/ERL
@@ -86,14 +86,15 @@
options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4)
options AUDIT # Security event auditing
options MAC # TrustedBSD MAC Framework
-#options KDTRACE_FRAME # Ensure frames are compiled in
-#options KDTRACE_HOOKS # Kernel DTrace hooks
-options INCLUDE_CONFIG_FILE # Include this file in kernel
+options KDTRACE_FRAME # Ensure frames are compiled in
+options KDTRACE_HOOKS # Kernel DTrace hooks
+options DDB_CTF # Kernel ELF linker loads CTF data
+options INCLUDE_CONFIG_FILE # Include this file in kernel
options TMPFS # Temporary file system
# Debugging for use in -current
#options KDB # Enable kernel debugger support.
-#options DDB # Support DDB.
+options DDB # Support DDB.
#options GDB # Support remote GDB.
#options DEADLKRES # Enable the deadlock resolver
#options INVARIANTS # Enable calls of extra sanity checking
Index: sys/modules/dtrace/Makefile
===================================================================
--- sys/modules/dtrace/Makefile
+++ sys/modules/dtrace/Makefile
@@ -22,11 +22,14 @@
.if ${MACHINE_CPUARCH} == "powerpc"
SUBDIR+= fbt fasttrap
.endif
-.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_ARCH} == "powerpc64"
+.if ${MACHINE_CPUARCH} == "amd64" || \
+ ${MACHINE_ARCH} == "mips64" || \
+ ${MACHINE_ARCH} == "powerpc64"
SUBDIR+= systrace_freebsd32
.endif
.if ${MACHINE_CPUARCH} == "aarch64" || \
${MACHINE_CPUARCH} == "arm" || \
+ ${MACHINE_CPUARCH} == "mips" || \
${MACHINE_CPUARCH} == "riscv"
SUBDIR+= fbt
.endif
Index: sys/modules/dtrace/dtraceall/Makefile
===================================================================
--- sys/modules/dtrace/dtraceall/Makefile
+++ sys/modules/dtrace/dtraceall/Makefile
@@ -8,7 +8,7 @@
CFLAGS+= -I${SYSDIR}
.if !defined(KERNBUILDDIR)
-.if ${MACHINE_ARCH} == "amd64"
+.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "mips64"
opt_compat.h:
echo "#define COMPAT_FREEBSD32 1" >> ${.TARGET}
.endif
Index: sys/modules/dtrace/dtraceall/dtraceall.c
===================================================================
--- sys/modules/dtrace/dtraceall/dtraceall.c
+++ sys/modules/dtrace/dtraceall/dtraceall.c
@@ -70,7 +70,8 @@
MODULE_DEPEND(dtraceall, dtnfscl, 1, 1, 1);
#endif
#if defined(__aarch64__) || defined(__amd64__) || defined(__arm__) || \
- defined(__i386__) || defined(__powerpc__) || defined(__riscv)
+ defined(__i386__) || defined(__mips__) || \
+ defined(__powerpc__) || defined(__riscv)
MODULE_DEPEND(dtraceall, fbt, 1, 1, 1);
#endif
#if defined(__amd64__) || defined(__i386__)

File Metadata

Mime Type
text/plain
Expires
Thu, Apr 9, 3:48 AM (5 h, 31 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28306141
Default Alt Text
D12227.1775706516.diff (3 KB)

Event Timeline