X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=include%2Flttng-kernel.h;h=6fa4e3925e562726c3ec184405ea4df4ff693398;hp=1ce9fc5e4b96157cb23896805f2ca4bf58e8afca;hb=f3ed775ef4842019b396f06095b053c3a70bc3c8;hpb=d686b40f66ea5df5ac0b9405991bbc33348b0a88

diff --git a/include/lttng-kernel.h b/include/lttng-kernel.h
index 1ce9fc5e4..6fa4e3925 100644
--- a/include/lttng-kernel.h
+++ b/include/lttng-kernel.h
@@ -28,27 +28,16 @@
 enum lttng_kernel_instrumentation {
 	LTTNG_KERNEL_TRACEPOINTS,
 	LTTNG_KERNEL_KPROBES,
-	LTTNG_KERNEL_FUNCTION_TRACER,
+	LTTNG_KERNEL_FUNCTION,
 };
 
 /*
  * LTTng DebugFS ABI structures.
+ *
+ * This is the kernel ABI copied from lttng-modules tree.
  */
 
-struct lttng_kernel_channel {
-	int overwrite;              /* 1: overwrite, 0: discard */
-	uint64_t subbuf_size;           /* in bytes */
-	uint64_t num_subbuf;
-	unsigned int switch_timer_interval; /* usecs */
-	unsigned int read_timer_interval;   /* usecs */
-};
-
-struct lttng_kernel_tracepoint {
-};
-
-/*
- * Either addr is used, or symbol_name and offset.
- */
+/* Either addr is used or symbol_name and offset. */
 struct lttng_kernel_kprobe {
 	uint64_t addr;
 
@@ -61,11 +50,10 @@ struct lttng_kernel_function_tracer {
 };
 
 struct lttng_kernel_event {
-	char name[LTTNG_SYM_NAME_LEN];  /* event name */
+	char name[LTTNG_SYM_NAME_LEN];
 	enum lttng_kernel_instrumentation instrumentation;
 	/* Per instrumentation type configuration */
 	union {
-		struct lttng_kernel_tracepoint tracepoint;
 		struct lttng_kernel_kprobe kprobe;
 		struct lttng_kernel_function_tracer ftrace;
 	} u;