X-Git-Url: http://git.lttng.org/?p=lttng-modules.git;a=blobdiff_plain;f=probes%2Flttng-events.h;h=925e12daaec0eb249a029abab1c57a577c221b6e;hp=39b28886b725ba9813fabb7a1a3840522adbf0e3;hb=259b6cb38d19bbe9c039728459bc25acc0f6f8a0;hpb=e6a17f26e9b344e9d2349a81f9dcee09e96593d6

diff --git a/probes/lttng-events.h b/probes/lttng-events.h
index 39b28886..925e12da 100644
--- a/probes/lttng-events.h
+++ b/probes/lttng-events.h
@@ -536,15 +536,6 @@ static void __event_probe__##_name(void *__data, _proto)		      \
 
 #include "lttng-events-reset.h"	/* Reset all macros within TRACE_EVENT */
 
-/* Override for syscall tracing */
-#ifndef TP_REGISTER_OVERRIDE
-#define TP_REGISTER_OVERRIDE	ltt_probe_register
-#endif
-
-#ifndef TP_UNREGISTER_OVERRIDE
-#define TP_UNREGISTER_OVERRIDE	ltt_probe_unregister
-#endif
-
 #define TP_ID1(_token, _system)	_token##_system
 #define TP_ID(_token, _system)	TP_ID1(_token, _system)
 #define module_init_eval1(_token, _system)	module_init(_token##_system)
@@ -552,20 +543,22 @@ static void __event_probe__##_name(void *__data, _proto)		      \
 #define module_exit_eval1(_token, _system)	module_exit(_token##_system)
 #define module_exit_eval(_token, _system)	module_exit_eval1(_token, _system)
 
+#ifndef TP_MODULE_OVERRIDE
 static int TP_ID(__lttng_events_init__, TRACE_SYSTEM)(void)
 {
 	wrapper_vmalloc_sync_all();
-	return TP_REGISTER_OVERRIDE(&TP_ID(__probe_desc___, TRACE_SYSTEM));
+	return ltt_probe_register(&TP_ID(__probe_desc___, TRACE_SYSTEM));
 }
 
 module_init_eval(__lttng_events_init__, TRACE_SYSTEM);
 
 static void TP_ID(__lttng_events_exit__, TRACE_SYSTEM)(void)
 {
-	TP_UNREGISTER_OVERRIDE(&TP_ID(__probe_desc___, TRACE_SYSTEM));
+	ltt_probe_unregister(&TP_ID(__probe_desc___, TRACE_SYSTEM));
 }
 
 module_exit_eval(__lttng_events_exit__, TRACE_SYSTEM);
+#endif
 
 #undef module_init_eval
 #undef module_exit_eval