D39871.diff
No OneTemporary
Actions

Size

983 B

Referenced Files

None

Subscribers

None

D39871.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
	@@ -2431,6 +2431,10 @@
	extern int dtrace_instr_size(uint8_t *instr);
	#endif

	+#if defined(__i386) \|\| defined(__amd64)
	+extern int dtrace_dis_get_byte(void *p);
	+#endif
	+
	#endif /* _ASM */

	#if defined(__i386) \|\| defined(__amd64)
	diff --git a/sys/cddl/dev/dtrace/x86/instr_size.c b/sys/cddl/dev/dtrace/x86/instr_size.c
	--- a/sys/cddl/dev/dtrace/x86/instr_size.c
	+++ b/sys/cddl/dev/dtrace/x86/instr_size.c
	@@ -49,6 +49,7 @@

	typedef u_int model_t;
	#define DATAMODEL_NATIVE 0
	+int dtrace_dis_get_byte(void *);
	int dtrace_instr_size(uint8_t *);
	int dtrace_instr_size_isa(uint8_t , model_t, int );
	#endif
	@@ -79,7 +80,7 @@
	/*
	* get a byte from instruction stream
	*/
	-static int
	+int
	dtrace_dis_get_byte(void *p)
	{
	int ret;