From c27106d925cde6384252d9cdcd4df560375a50dd Mon Sep 17 00:00:00 2001 From: Mark Johnston Date: Thu, 19 Sep 2024 09:22:13 +0000 Subject: [PATCH] dtrace/amd64: Remove the dtrace_invop_callsite symbol It is not needed after commit 7e80fd5ef397. No functional change intended. Reviewed by: avg MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D46675 (cherry picked from commit 06e7bc83f6a49b99f87ad1a6034e2fad54ebe7f3) --- sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h | 2 ++ sys/cddl/dev/dtrace/amd64/dtrace_asm.S | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h b/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h index 98ae9eba120..263b254b902 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h +++ b/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h @@ -2400,8 +2400,10 @@ extern int dtrace_mach_aframes(void); #if defined(__i386) || defined(__amd64) extern int dtrace_instr_size_isa(uint8_t *, model_t, int *); +#ifdef __i386 extern void dtrace_invop_callsite(void); #endif +#endif extern void dtrace_invop_add(int (*)(uintptr_t, struct trapframe *, uintptr_t)); extern void dtrace_invop_remove(int (*)(uintptr_t, struct trapframe *, uintptr_t)); diff --git a/sys/cddl/dev/dtrace/amd64/dtrace_asm.S b/sys/cddl/dev/dtrace/amd64/dtrace_asm.S index 0c8cd9a83d0..4c18fbf0822 100644 --- a/sys/cddl/dev/dtrace/amd64/dtrace_asm.S +++ b/sys/cddl/dev/dtrace/amd64/dtrace_asm.S @@ -56,9 +56,6 @@ swapgs; \ 1: addq $TF_RIP,%rsp; -.globl dtrace_invop_callsite -.type dtrace_invop_callsite,@function - ENTRY(dtrace_invop_start) /* @@ -78,7 +75,6 @@ movq %rsp, %rdx call dtrace_invop -dtrace_invop_callsite: addq $16, %rsp cmpl $DTRACE_INVOP_PUSHL_EBP, %eax