Page MenuHomeFreeBSD
Files F97579575

D46675.diff
No OneTemporary
Actions

D46675.diff
View Options

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
@@ -2400,8 +2400,10 @@
#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
--- 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

File Metadata

Mime Type
text/plain
Expires
Tue, Oct 1, 4:27 AM (22 h, 14 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
13215975
Default Alt Text
D46675.diff (1 KB)

Event Timeline