Namespace RING_BUFFER_ALIGN macros

[lttng-ust.git] / libringbuffer / backend_internal.h

diff --git a/libringbuffer/backend_internal.h b/libringbuffer/backend_internal.h
index 766fde2d30d851d79bcd05770be5b8786c991807..68370c7edb18187c5c99301f3edee20b3203d694 100644 (file)
--- a/libringbuffer/backend_internal.h
+++ b/libringbuffer/backend_internal.h
@@ -209,7 +209,7 @@ int lib_ring_buffer_backend_get_pages(const struct lttng_ust_lib_ring_buffer_con
 {
        struct lttng_ust_lib_ring_buffer_backend *bufb = &ctx->buf->backend;
        struct channel_backend *chanb = &ctx->chan->backend;
-       struct lttng_ust_shm_handle *handle = ctx->handle;
+       struct lttng_ust_shm_handle *handle = ctx->chan->handle;
        size_t sbidx;
        size_t offset = ctx->buf_offset;
        struct lttng_ust_lib_ring_buffer_backend_subbuffer *wsb;
@@ -635,7 +635,7 @@ do {                                                                \
  * write len bytes to dest with c
  */
 static inline
-void lib_ring_buffer_do_memset(char *dest, int c, unsigned long len)
+void lib_ring_buffer_do_memset(char *dest, char c, unsigned long len)
 {
        unsigned long i;