diff --git a/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h b/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
--- a/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
@@ -2398,7 +2398,7 @@
 
 extern int dtrace_mach_aframes(void);
 
-#if defined(__i386) || defined(__amd64)
+#if defined(__i386)
 extern int dtrace_instr_size_isa(uint8_t *, model_t, int *);
 extern void dtrace_invop_callsite(void);
 #endif
diff --git a/sys/cddl/dev/dtrace/amd64/dtrace_asm.S b/sys/cddl/dev/dtrace/amd64/dtrace_asm.S
--- 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