X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Fringbuffer%2Ffrontend_api.h;h=b473a61b60407859366fd7965a2e548f23357a70;hb=de5eee31f2eac8cb42b187943aba480e00d0e6ee;hp=143aa02ba927af37b0941a12625590599ffa63c9;hpb=e20c0fec4a2e120143f2e71c63d9fcd664af55a4;p=lttng-modules.git

diff --git a/include/ringbuffer/frontend_api.h b/include/ringbuffer/frontend_api.h
index 143aa02b..b473a61b 100644
--- a/include/ringbuffer/frontend_api.h
+++ b/include/ringbuffer/frontend_api.h
@@ -14,7 +14,7 @@
 #define _LIB_RING_BUFFER_FRONTEND_API_H
 
 #include <ringbuffer/frontend.h>
-#include <wrapper/percpu-defs.h>
+#include <linux/percpu-defs.h>
 #include <linux/errno.h>
 #include <linux/prefetch.h>
 
@@ -58,7 +58,7 @@ static inline
 void lib_ring_buffer_put_cpu(const struct lttng_kernel_ring_buffer_config *config)
 {
 	barrier();
-	(*lttng_this_cpu_ptr(&lib_ring_buffer_nesting))--;
+	(*this_cpu_ptr(&lib_ring_buffer_nesting))--;
 	rcu_read_unlock_sched_notrace();
 }
 
@@ -280,7 +280,7 @@ void lib_ring_buffer_commit(const struct lttng_kernel_ring_buffer_config *config
 	commit_count = v_read(config, &cc_hot->cc);
 
 	lib_ring_buffer_check_deliver(config, buf, chan, offset_end - 1,
-				      commit_count, endidx, ctx->priv.tsc);
+				      commit_count, endidx, ctx);
 	/*
 	 * Update used size at each commit. It's needed only for extracting
 	 * ring_buffer buffers from vmcore, after crash.