X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=libust%2Fserialize.c;h=beaf6390b544a4dd96f0b4c30afdb0692283435f;hb=aa08b4413291fabcbd1b1144377d37034ad361de;hp=238bd257aebefff6861eaa231786410460b2f8f6;hpb=772030fed323e388da467735cf4b5e8781acb710;p=lttng-ust.git

diff --git a/libust/serialize.c b/libust/serialize.c
index 238bd257..beaf6390 100644
--- a/libust/serialize.c
+++ b/libust/serialize.c
@@ -32,10 +32,10 @@
 #include <string.h>
 #include <stdint.h>
 
-#include "kernelcompat.h"
+#include <ust/kernelcompat.h>
 #define _LGPL_SOURCE
-#include <urcu.h>
-#include <kcompat/rculist.h>
+#include <urcu-bp.h>
+#include <urcu/rculist.h>
 
 #include "relay.h"
 #include "tracer.h"
@@ -583,7 +583,8 @@ void ltt_write_event_data(struct rchan_buf *buf, size_t buf_offset,
 
 
 notrace void ltt_vtrace(const struct marker *mdata, void *probe_data,
-			void *call_data, const char *fmt, va_list *args)
+			struct registers *regs, void *call_data,
+			const char *fmt, va_list *args)
 {
 	int largest_align, ret;
 	struct ltt_active_marker *pdata;
@@ -689,7 +690,7 @@ notrace void ltt_vtrace(const struct marker *mdata, void *probe_data,
 		/* Out-of-order commit */
 		ltt_commit_slot(channel, &transport_data, buf_offset,
 				data_size, slot_size);
-		DBG("just commited event at offset %ld and size %zd\n", buf_offset, slot_size);
+		DBG("just commited event at offset %ld and size %zd", buf_offset, slot_size);
 	}
 //ust//	__get_cpu_var(ltt_nesting)--;
 	ltt_nesting--;
@@ -697,12 +698,13 @@ notrace void ltt_vtrace(const struct marker *mdata, void *probe_data,
 }
 
 notrace void ltt_trace(const struct marker *mdata, void *probe_data,
-		       void *call_data, const char *fmt, ...)
+		       struct registers *regs, void *call_data,
+		       const char *fmt, ...)
 {
 	va_list args;
 
 	va_start(args, fmt);
-	ltt_vtrace(mdata, probe_data, call_data, fmt, &args);
+	ltt_vtrace(mdata, probe_data, regs, call_data, fmt, &args);
 	va_end(args);
 }