X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Fringbuffer%2Ffrontend_api.h;h=e35070736e36f32875e9512921c941a585147cbe;hb=742ac92a271c97c49bd79444594c0e8dfe099f9e;hp=879461f37f1fa872b54285475f7d99c03a4f1c8b;hpb=f73bcf5eafdc10b2bbb32de0bcef709de0f8f5e5;p=lttng-ust.git

diff --git a/src/common/ringbuffer/frontend_api.h b/src/common/ringbuffer/frontend_api.h
index 879461f3..e3507073 100644
--- a/src/common/ringbuffer/frontend_api.h
+++ b/src/common/ringbuffer/frontend_api.h
@@ -26,7 +26,7 @@
  * Returns a nesting level >= 0 on success, -EPERM on failure (nesting
  * count too high).
  *
- * asm volatile and "memory" clobber prevent the compiler from moving
+ * __asm__ __volatile__ and "memory" clobber prevent the compiler from moving
  * instructions out of the ring buffer nesting count. This is required to ensure
  * that probe side-effects which can cause recursion (e.g. unforeseen traps,
  * divisions by 0, ...) are triggered within the incremented nesting count
@@ -257,7 +257,7 @@ void lib_ring_buffer_commit(const struct lttng_ust_ring_buffer_config *config,
 	/*
 	 * Must count record before incrementing the commit count.
 	 */
-	subbuffer_count_record(config, ctx, &buf->backend, endidx, handle);
+	subbuffer_count_record(config, ctx);
 
 	/*
 	 * Order all writes to buffer before the commit count update that will
@@ -288,7 +288,7 @@ void lib_ring_buffer_commit(const struct lttng_ust_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, handle, ctx_private->tsc);
+				      commit_count, endidx, handle, ctx);
 	/*
 	 * Update used size at each commit. It's needed only for extracting
 	 * ring_buffer buffers from vmcore, after crash.