xnu-6153.61.1.tar.gz

[apple/xnu.git] / bsd / sys / fasttrap.h

diff --git a/bsd/sys/fasttrap.h b/bsd/sys/fasttrap.h
index 3aa0db47161d76db5fe2493c4755713565d4ada4..7fa9815453a066db7d4c8aa41c727f3e99b85f86 100644 (file)
--- a/bsd/sys/fasttrap.h
+++ b/bsd/sys/fasttrap.h
@@ -27,8 +27,6 @@
 #ifndef        _SYS_FASTTRAP_H
 #define        _SYS_FASTTRAP_H
 
-/* #pragma ident       "@(#)fasttrap.h 1.5     06/03/30 SMI" */
-
 #include <sys/fasttrap_isa.h>
 #include <sys/dtrace.h>
 #include <sys/types.h>
@@ -75,14 +73,21 @@ typedef struct fasttrap_probe_spec {
 #if defined(__APPLE__)
        fasttrap_provider_type_t        ftps_provider_type;
        fasttrap_probe_type_t           ftps_probe_type;
+#if defined(__arm__) || defined(__arm64__)
+       uint32_t                        ftps_arch_subinfo;      // For any additional per probe architecture specific data
+#endif
 #endif
        char                            ftps_func[DTRACE_FUNCNAMELEN];
        char                            ftps_mod[DTRACE_MODNAMELEN];
 
 #if defined(__APPLE__)
+#if defined(__arm__) || defined(__arm64__)
+       // We already have 'padding' from the ftps_arch_subinfo above
+#else
 #if !defined(__LP64__)
        uint32_t                        pad; /* Explicit pad to keep ILP32 and LP64 lined up. */
 #endif
+#endif
 #endif
        uint64_t                        ftps_pc;
        uint64_t                        ftps_size;