X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=lttng-events.h;h=e0b4358f4024e492c04720072d4ab1a96c5c64af;hb=ace98cd6e2b75a8d41cfc38365ca74366acb527c;hp=173f369f067cf2362de97f486ac491939a4378e2;hpb=1e36732678d7cc650940b4508031acf2f6ffcd1b;p=lttng-modules.git

diff --git a/lttng-events.h b/lttng-events.h
index 173f369f..e0b4358f 100644
--- a/lttng-events.h
+++ b/lttng-events.h
@@ -307,9 +307,6 @@ struct lttng_event {
 			struct lttng_krp *lttng_krp;
 			char *symbol_name;
 		} kretprobe;
-		struct {
-			char *symbol_name;
-		} ftrace;
 	} u;
 	struct list_head list;		/* Event list in session */
 	unsigned int metadata_dumped:1;
@@ -324,7 +321,7 @@ struct lttng_event {
 };
 
 enum lttng_enabler_type {
-	LTTNG_ENABLER_WILDCARD,
+	LTTNG_ENABLER_STAR_GLOB,
 	LTTNG_ENABLER_NAME,
 };
 
@@ -810,32 +807,6 @@ int lttng_kretprobes_event_enable_state(struct lttng_event *event,
 }
 #endif
 
-#ifdef CONFIG_DYNAMIC_FTRACE
-int lttng_ftrace_register(const char *name,
-			  const char *symbol_name,
-			  struct lttng_event *event);
-void lttng_ftrace_unregister(struct lttng_event *event);
-void lttng_ftrace_destroy_private(struct lttng_event *event);
-#else
-static inline
-int lttng_ftrace_register(const char *name,
-			  const char *symbol_name,
-			  struct lttng_event *event)
-{
-	return -ENOSYS;
-}
-
-static inline
-void lttng_ftrace_unregister(struct lttng_event *event)
-{
-}
-
-static inline
-void lttng_ftrace_destroy_private(struct lttng_event *event)
-{
-}
-#endif
-
 int lttng_calibrate(struct lttng_kernel_calibrate *calibrate);
 
 extern const struct file_operations lttng_tracepoint_list_fops;