Revert "Fix: flush empty packets on snapshot channel"

[lttng-modules.git] / lib / ringbuffer / frontend_api.h

diff --git a/lib/ringbuffer/frontend_api.h b/lib/ringbuffer/frontend_api.h
index 31ccbfad020c5a1afa1b8570f1e6be0dd28438fa..b92ff290c300f07e90498612719fdfe190d9d79a 100644 (file)
--- a/lib/ringbuffer/frontend_api.h
+++ b/lib/ringbuffer/frontend_api.h
@@ -29,7 +29,8 @@
  * See linux/ringbuffer/frontend.h for channel allocation and read-side API.
  */
 
-#include "../../wrapper/ringbuffer/frontend.h"
+#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);
 }
 
 /**