--- ceph-16.2.6-681-gfdc003bc/src/tracing/bluestore.tp.orig	2021-12-07 08:02:04.682972474 -0500
+++ ceph-16.2.6-681-gfdc003bc/src/tracing/bluestore.tp	2021-12-07 08:03:13.840771852 -0500
@@ -1,3 +1,9 @@
+
+#ifdef __x86_64__
+#undef STAP_SDT_ARG_CONSTRAINT
+#define STAP_SDT_ARG_CONSTRAINT norx
+#endif
+
 #include "include/int_types.h"
 
 TRACEPOINT_EVENT(bluestore, transaction_state_duration,
--- ceph-16.2.6-681-gfdc003bc/src/tracing/librbd.tp.orig	2021-12-07 09:50:16.467579483 -0500
+++ ceph-16.2.6-681-gfdc003bc/src/tracing/librbd.tp	2021-12-07 09:50:47.620026940 -0500
@@ -1,3 +1,8 @@
+#ifdef __x86_64__
+#undef STAP_SDT_ARG_CONSTRAINT
+#define STAP_SDT_ARG_CONSTRAINT norx
+#endif
+
 #include "tracing/tracing-common.h"
 #include "include/rbd/librbd.h"
 #include "include/int_types.h"
--- ceph-16.2.7/src/tracing/objectstore.tp.orig	2021-12-08 18:38:03.393320159 -0500
+++ ceph-16.2.7/src/tracing/objectstore.tp	2021-12-08 18:38:37.300716838 -0500
@@ -1,3 +1,8 @@
+#ifdef __x86_64__
+#undef STAP_SDT_ARG_CONSTRAINT
+#define STAP_SDT_ARG_CONSTRAINT norx
+#endif
+
 #include "include/int_types.h"
 
 TRACEPOINT_EVENT(objectstore, exists_enter,
--- ceph-16.2.7/src/tracing/librados.tp.orig	2021-12-08 19:31:01.921758876 -0500
+++ ceph-16.2.7/src/tracing/librados.tp	2021-12-08 19:32:18.493394738 -0500
@@ -1,3 +1,9 @@
+
+#ifdef __x86_64__
+#undef STAP_SDT_ARG_CONSTRAINT
+#define STAP_SDT_ARG_CONSTRAINT norx
+#endif
+
 #include "tracing/tracing-common.h"
 #include "include/rados/librados.h"
 #include "include/int_types.h"
--- ceph-16.2.7/src/tracing/osd.tp.orig	2021-12-09 07:16:53.866135497 -0500
+++ ceph-16.2.7/src/tracing/osd.tp	2021-12-09 07:17:12.088809036 -0500
@@ -1,3 +1,8 @@
+#ifdef __x86_64__
+#undef STAP_SDT_ARG_CONSTRAINT
+#define STAP_SDT_ARG_CONSTRAINT norx
+#endif
+#
 #include "include/int_types.h"
 
 TRACEPOINT_EVENT(osd, prepare_tx_enter,