X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=include%2Fringbuffer%2Fconfig.h;h=4ce36d18c9fa4af35ec633208616239396cdb51d;hb=8a57ec025ffbe56153748fd69b60118862707182;hp=bc638f941f20365d76fef12b004c0619fe10934a;hpb=b1199bd39f4b617b99518b72ceeea644b164b901;p=lttng-modules.git

diff --git a/include/ringbuffer/config.h b/include/ringbuffer/config.h
index bc638f94..4ce36d18 100644
--- a/include/ringbuffer/config.h
+++ b/include/ringbuffer/config.h
@@ -19,7 +19,7 @@
 struct lib_ring_buffer;
 struct channel;
 struct lib_ring_buffer_config;
-struct lib_ring_buffer_ctx;
+struct lttng_kernel_ring_buffer_ctx;
 struct lttng_kernel_ring_buffer_ctx_private;
 
 /*
@@ -36,7 +36,7 @@ struct lib_ring_buffer_client_cb {
 	size_t (*record_header_size) (const struct lib_ring_buffer_config *config,
 				      struct channel *chan, size_t offset,
 				      size_t *pre_header_padding,
-				      struct lib_ring_buffer_ctx *ctx,
+				      struct lttng_kernel_ring_buffer_ctx *ctx,
 				      void *client_ctx);
 
 	/* Slow path only, at subbuffer switch */
@@ -198,7 +198,7 @@ struct lttng_kernel_ring_buffer_ctx_private {
  * lib_ring_buffer_try_discard_reserve(), lib_ring_buffer_align_ctx() and
  * lib_ring_buffer_write().
  */
-struct lib_ring_buffer_ctx {
+struct lttng_kernel_ring_buffer_ctx {
 	/* Private ring buffer context, set by reserve callback. */
 	struct lttng_kernel_ring_buffer_ctx_private priv;
 
@@ -210,7 +210,7 @@ struct lib_ring_buffer_ctx {
 					 * alignment of the largest element
 					 * in the payload
 					 */
-	struct lttng_probe_ctx *probe_ctx;	/* Probe context */
+	struct lttng_kernel_probe_ctx *probe_ctx;	/* Probe context */
 };
 
 /**
@@ -221,10 +221,10 @@ struct lib_ring_buffer_ctx {
  * @largest_align: largest alignment within data payload types
  */
 static inline
-void lib_ring_buffer_ctx_init(struct lib_ring_buffer_ctx *ctx,
+void lib_ring_buffer_ctx_init(struct lttng_kernel_ring_buffer_ctx *ctx,
 			      void *client_priv,
 			      size_t data_size, int largest_align,
-			      struct lttng_probe_ctx *probe_ctx)
+			      struct lttng_kernel_probe_ctx *probe_ctx)
 {
 	ctx->client_priv = client_priv;
 	ctx->data_size = data_size;
@@ -294,7 +294,7 @@ unsigned int lib_ring_buffer_align(size_t align_drift, size_t size_of_type)
  * @ctx: ring buffer context.
  */
 static inline
-void lib_ring_buffer_align_ctx(struct lib_ring_buffer_ctx *ctx,
+void lib_ring_buffer_align_ctx(struct lttng_kernel_ring_buffer_ctx *ctx,
 			   size_t alignment)
 {
 	ctx->priv.buf_offset += lib_ring_buffer_align(ctx->priv.buf_offset,