X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-events.h;h=bdd73ff6e9279cda143459cab8aea0cd6a43f44e;hb=3eb95be4200bdde975385f3acd00943ec3b78cc2;hp=f62e0cb06380bd4b5c00e329af5bf0db6dece020;hpb=41f229dc03b585cc3f434e1db1a5a68101c5da9a;p=lttng-modules.git

diff --git a/lttng-events.h b/lttng-events.h
index f62e0cb0..bdd73ff6 100644
--- a/lttng-events.h
+++ b/lttng-events.h
@@ -521,6 +521,7 @@ struct lttng_session {
 	struct list_head enablers_head;
 	/* Hash table of events */
 	struct lttng_event_ht events_ht;
+	char name[LTTNG_KERNEL_SESSION_NAME_LEN];
 };
 
 struct lttng_metadata_cache {
@@ -716,7 +717,7 @@ int lttng_add_migratable_to_ctx(struct lttng_ctx **ctx)
 
 int lttng_add_callstack_to_ctx(struct lttng_ctx **ctx, int type);
 
-#if defined(CONFIG_PERF_EVENTS) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+#if defined(CONFIG_PERF_EVENTS)
 int lttng_add_perf_counter_to_ctx(uint32_t type,
 				  uint64_t config,
 				  const char *name,
@@ -891,8 +892,6 @@ int lttng_calibrate(struct lttng_kernel_calibrate *calibrate);
 extern const struct file_operations lttng_tracepoint_list_fops;
 extern const struct file_operations lttng_syscall_list_fops;
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
 #define TRACEPOINT_HAS_DATA_ARG
-#endif
 
 #endif /* _LTTNG_EVENTS_H */