X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lib%2Fringbuffer%2Ffrontend_api.h;h=b622bd7e865cae4079a4a91c2bab87eed34ebb32;hb=1816623505f9a0111fa5041da63f8e1099b6ffcc;hp=31ccbfad020c5a1afa1b8570f1e6be0dd28438fa;hpb=635e457c7c8b9b5df544abce1ab326401983f2da;p=lttng-modules.git

diff --git a/lib/ringbuffer/frontend_api.h b/lib/ringbuffer/frontend_api.h
index 31ccbfad..b622bd7e 100644
--- a/lib/ringbuffer/frontend_api.h
+++ b/lib/ringbuffer/frontend_api.h
@@ -30,6 +30,7 @@
  */
 
 #include "../../wrapper/ringbuffer/frontend.h"
+#include "../../wrapper/percpu-defs.h"
 #include <linux/errno.h>
 #include <linux/prefetch.h>
 
@@ -73,7 +74,7 @@ static inline
 void lib_ring_buffer_put_cpu(const struct lib_ring_buffer_config *config)
 {
 	barrier();
-	__get_cpu_var(lib_ring_buffer_nesting)--;
+	(*lttng_this_cpu_ptr(&lib_ring_buffer_nesting))--;
 	rcu_read_unlock_sched_notrace();
 }
 
@@ -298,8 +299,7 @@ void lib_ring_buffer_commit(const struct lib_ring_buffer_config *config,
 	 * ring_buffer buffers from vmcore, after crash.
 	 */
 	lib_ring_buffer_write_commit_counter(config, buf, chan, endidx,
-					     ctx->buf_offset, commit_count,
-					 ctx->slot_size);
+			offset_end, commit_count);
 }
 
 /**