X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/b0d623f7f2ae71ed96e60569f61f9a9a27016e80..04b8595b18b1b41ac7a206e4b3d51a635f8413d7:/bsd/dev/dtrace/systrace.h

diff --git a/bsd/dev/dtrace/systrace.h b/bsd/dev/dtrace/systrace.h
index 915ed2561..e9af96363 100644
--- a/bsd/dev/dtrace/systrace.h
+++ b/bsd/dev/dtrace/systrace.h
@@ -29,7 +29,6 @@
 
 /* #pragma ident	"@(#)systrace.h	1.3	06/09/19 SMI" */
 
-#if defined(__APPLE__)
 #ifdef KERNEL
 #ifndef _KERNEL
 #define _KERNEL /* Solaris vs. Darwin */
@@ -38,9 +37,6 @@
 
 #include <sys/dtrace.h>
 
-#endif /* __APPLE__ */
-#include <sys/dtrace.h>
-
 #ifdef	__cplusplus
 extern "C" {
 #endif
@@ -50,42 +46,28 @@ extern "C" {
 typedef struct systrace_sysent {
 	dtrace_id_t	stsy_entry;
 	dtrace_id_t	stsy_return;
-#if !defined(__APPLE__)
-	int64_t		(*stsy_underlying)();
-#else
 	int32_t		(*stsy_underlying)(struct proc *, void *, int *);
 	int32_t		stsy_return_type;
-#endif /* __APPLE__ */
 } systrace_sysent_t;
 
 extern systrace_sysent_t *systrace_sysent;
 extern systrace_sysent_t *systrace_sysent32;
 
-#if !defined(__APPLE__)
-extern void (*systrace_probe)(dtrace_id_t, uintptr_t, uintptr_t,
-    uintptr_t, uintptr_t, uintptr_t, uintptr_t);
-extern void systrace_stub(dtrace_id_t, uintptr_t, uintptr_t,
-    uintptr_t, uintptr_t, uintptr_t, uintptr_t);
-
-extern int64_t dtrace_systrace_syscall(uintptr_t arg0, uintptr_t arg1,
-    uintptr_t arg2, uintptr_t arg3, uintptr_t arg4, uintptr_t arg5);
-#else
 extern void (*systrace_probe)(dtrace_id_t, uint64_t, uint64_t,
-    uint64_t, uint64_t, uint64_t, uint64_t, uint64_t, uint64_t);
+    uint64_t, uint64_t, uint64_t);
 extern void systrace_stub(dtrace_id_t, uint64_t, uint64_t,
-    uint64_t, uint64_t, uint64_t, uint64_t, uint64_t, uint64_t);
+    uint64_t, uint64_t, uint64_t);
 
 extern int32_t dtrace_systrace_syscall(struct proc *, void *, int *);
 
 extern void dtrace_systrace_syscall_return(unsigned short, int, int *);
-#endif /* __APPLE__ */
 
 #ifdef _SYSCALL32_IMPL
 extern int64_t dtrace_systrace_syscall32(uintptr_t arg0, uintptr_t arg1,
     uintptr_t arg2, uintptr_t arg3, uintptr_t arg4, uintptr_t arg5);
 #endif
 
-#endif
+#endif /* _KERNEL */
 
 #ifdef	__cplusplus
 }