X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-events.h;h=19037062d8f4b6c08348aa885c4bbc54b04b4182;hb=8a3af9ee05aca2d634b5fb14a910daa9b03feafb;hp=f74f9d52cccb81302b18c242712cb2941009a4e1;hpb=3aed4dca825a63757a3c95b9d41019660f83e02d;p=lttng-modules.git

diff --git a/lttng-events.h b/lttng-events.h
index f74f9d52..19037062 100644
--- a/lttng-events.h
+++ b/lttng-events.h
@@ -15,7 +15,7 @@
 #include <linux/kprobes.h>
 #include <linux/kref.h>
 #include <lttng-cpuhotplug.h>
-#include <wrapper/uuid.h>
+#include <linux/uuid.h>
 #include <wrapper/uprobes.h>
 #include <lttng-tracer.h>
 #include <lttng-abi.h>
@@ -716,7 +716,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,
@@ -785,6 +785,7 @@ void lttng_kprobes_destroy_private(struct lttng_event *event)
 
 int lttng_event_add_callsite(struct lttng_event *event,
 	struct lttng_kernel_event_callsite *callsite);
+
 #ifdef CONFIG_UPROBES
 int lttng_uprobes_register(const char *name,
 	int fd, struct lttng_event *event);
@@ -802,7 +803,7 @@ int lttng_uprobes_register(const char *name,
 
 static inline
 int lttng_uprobes_add_callsite(struct lttng_event *event,
-	struct lttng_kernel_callsite_uprobe *callsite)
+	struct lttng_kernel_event_callsite *callsite)
 {
 	return -ENOSYS;
 }
@@ -890,8 +891,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 */