diff options
| author | Mark Johnston <markj@FreeBSD.org> | 2026-02-04 14:48:34 +0000 |
|---|---|---|
| committer | Mark Johnston <markj@FreeBSD.org> | 2026-02-16 13:42:10 +0000 |
| commit | 769bc687739927d3e7115b27b3f4579883682459 (patch) | |
| tree | ab6b2940e747c498298ed6ceee8e7b862c0636b1 | |
| parent | 361b80310299f36a8e97dde7c08721868d9c805b (diff) | |
sdt: Enable on 32-bit powerpc and powerpc64le
Reviewed by: jhibbits, adrian
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D54814
(cherry picked from commit 6e32e8d7d16148e9bad1e3544363f318582f4c13)
| -rw-r--r-- | sys/conf/files.powerpc | 2 | ||||
| -rw-r--r-- | sys/modules/dtrace/Makefile | 4 | ||||
| -rw-r--r-- | sys/powerpc/powerpc/sdt_machdep.c | 4 |
3 files changed, 4 insertions, 6 deletions
diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc index 0deada385f31..b1aa54c9aa64 100644 --- a/sys/conf/files.powerpc +++ b/sys/conf/files.powerpc @@ -391,7 +391,7 @@ powerpc/powerpc/platform.c standard powerpc/powerpc/platform_if.m standard powerpc/powerpc/ptrace_machdep.c standard powerpc/powerpc/sc_machdep.c optional sc -powerpc/powerpc/sdt_machdep.c optional powerpc64 kdtrace_hooks +powerpc/powerpc/sdt_machdep.c optional kdtrace_hooks powerpc/powerpc/setjmp.S standard powerpc/powerpc/sigcode32.S optional powerpc | powerpcspe | compat_freebsd32 powerpc/powerpc/sigcode64.S optional powerpc64 | powerpc64le diff --git a/sys/modules/dtrace/Makefile b/sys/modules/dtrace/Makefile index 3a3769b8b4b5..019b5e951dcf 100644 --- a/sys/modules/dtrace/Makefile +++ b/sys/modules/dtrace/Makefile @@ -9,6 +9,7 @@ SUBDIR= dtaudit \ fbt \ profile \ prototype \ + sdt \ systrace .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" @@ -31,8 +32,5 @@ SUBDIR+= fasttrap SUBDIR+= systrace_freebsd32 .endif .endif -.if ${MACHINE_CPUARCH} != "powerpc" || ${MACHINE_ARCH} == "powerpc64" -SUBDIR+= sdt -.endif .include <bsd.subdir.mk> diff --git a/sys/powerpc/powerpc/sdt_machdep.c b/sys/powerpc/powerpc/sdt_machdep.c index 8a84016a9571..04a4cc170769 100644 --- a/sys/powerpc/powerpc/sdt_machdep.c +++ b/sys/powerpc/powerpc/sdt_machdep.c @@ -37,8 +37,8 @@ sdt_tracepoint_patch(uintptr_t patchpoint, uintptr_t target) uint32_t instr; KASSERT(sdt_tracepoint_valid(patchpoint, target), - ("%s: invalid tracepoint %#lx -> %#lx", - __func__, patchpoint, target)); + ("%s: invalid tracepoint %#jx -> %#jx", + __func__, (uintmax_t)patchpoint, (uintmax_t)target)); instr = ((target - patchpoint) & 0x7fffffful) | 0x48000000; memcpy((void *)patchpoint, &instr, sizeof(instr)); |