git: 06e7bc83f6a4 - main - dtrace/amd64: Remove the dtrace_invop_callsite symbol

The branch main has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=06e7bc83f6a49b99f87ad1a6034e2fad54ebe7f3

commit 06e7bc83f6a49b99f87ad1a6034e2fad54ebe7f3
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2024-09-19 09:22:13 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2024-09-19 09:22:13 +0000

    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
---
 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 98ae9eba120a..263b254b9021 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 0c8cd9a83d01..4c18fbf08220 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