X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Flttng-probes.c;h=00f39112f04d84485bc9d482aad9c632c92dab6b;hb=d644d1df290531d8c2be54d6cf4485cc5ebeefde;hp=8ac061e70e6721a45704f7aa3654b583faad5c13;hpb=0bcedee9330c118a554bd2446303712a2702e491;p=lttng-modules.git

diff --git a/src/lttng-probes.c b/src/lttng-probes.c
index 8ac061e7..00f39112 100644
--- a/src/lttng-probes.c
+++ b/src/lttng-probes.c
@@ -25,7 +25,7 @@ static LIST_HEAD(_probe_list);
 static LIST_HEAD(lazy_probe_init);
 
 /*
- * lazy_nesting counter ensures we don't trigger lazy probe registration
+ * lazy_nesting counter ensures we don't event_notifier lazy probe registration
  * fixup while we are performing the fixup. It is protected by the
  * sessions lock.
  */
@@ -124,6 +124,8 @@ void fixup_lazy_probes(void)
 	}
 	ret = lttng_fix_pending_events();
 	WARN_ON_ONCE(ret);
+	ret = lttng_fix_pending_event_notifiers();
+	WARN_ON_ONCE(ret);
 	lazy_nesting--;
 }
 
@@ -173,7 +175,7 @@ int lttng_probe_register(struct lttng_probe_desc *desc)
 	 * the probe immediately, since we cannot delay event
 	 * registration because they are needed ASAP.
 	 */
-	if (lttng_session_active())
+	if (lttng_session_active() || lttng_event_notifier_active())
 		fixup_lazy_probes();
 end:
 	lttng_unlock_sessions();