X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/b0d623f7f2ae71ed96e60569f61f9a9a27016e80..813fb2f63a553c957e917ede5f119b021d6ce391:/osfmk/mach/i386/sdt_isa.h

diff --git a/osfmk/mach/i386/sdt_isa.h b/osfmk/mach/i386/sdt_isa.h
index c32239162..961d9f638 100644
--- a/osfmk/mach/i386/sdt_isa.h
+++ b/osfmk/mach/i386/sdt_isa.h
@@ -41,7 +41,7 @@
  */
 #ifdef __x86_64__
 #define DTRACE_LAB(p, n)		\
-   "__dtrace_probeDOLLAR" DTRACE_TOSTRING(__LINE__) DTRACE_STRINGIFY(_##p##___##n)
+   "__dtrace_probe$" DTRACE_TOSTRING(%=__LINE__) DTRACE_STRINGIFY(_##p##___##n)
 
 #define DTRACE_LABEL(p, n)		\
       ".section __DATA, __data\n\t"	\
@@ -51,7 +51,7 @@
 	"1:"
 #else
 #define DTRACE_LAB(p, n)		\
-   "__dtrace_probe$" DTRACE_TOSTRING(__LINE__) DTRACE_STRINGIFY(_##p##___##n)
+   "__dtrace_probe$" DTRACE_TOSTRING(%=__LINE__) DTRACE_STRINGIFY(_##p##___##n)
 
 #define DTRACE_LABEL(p, n)		\
       ".section __DATA, __data\n\t"	\
@@ -62,7 +62,7 @@
 #endif
 #else	/* !KERNEL */
 #define DTRACE_LABEL(p, n)									\
-	"__dtrace_probe$" DTRACE_TOSTRING(__LINE__) DTRACE_STRINGIFY(_##p##___##n) ":"	"\n\t"
+	"__dtrace_probe$" DTRACE_TOSTRING(%=__LINE__) DTRACE_STRINGIFY(_##p##___##n) ":"	"\n\t"
 #endif	/* !KERNEL */
 
 #ifdef DTRACE_CALL_TEST
@@ -97,12 +97,14 @@
 #define ARGS6_EXTENT	6
 #define ARGS7_EXTENT	7
 #define ARGS8_EXTENT	8
-#define ARGS9_EXTENT	10	
-#define ARGS10_EXTENT	10	
+#define ARGS9_EXTENT	9
+#define ARGS10_EXTENT	10
 
 #define DTRACE_CALL0ARGS(provider, name)							\
 	asm volatile (										\
 		      DTRACE_CALL(provider, name)						\
+	              :										\
+	              :										\
 	);
 
 #define DTRACE_CALL1ARG(provider, name)								\