X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=libringbuffer%2Fringbuffer-config.h;h=37669b0d0b8e7e88a4d00c31ab547df740c703ee;hb=c53279a3e7796da67c5ad8d5e5657bf03def2dcb;hp=0d33ace253ead62e70923d2de28a6fdc629817ea;hpb=3d3a2bb817fcab854dc3a90dd80e073869bbccb4;p=lttng-ust.git

diff --git a/libringbuffer/ringbuffer-config.h b/libringbuffer/ringbuffer-config.h
index 0d33ace2..37669b0d 100644
--- a/libringbuffer/ringbuffer-config.h
+++ b/libringbuffer/ringbuffer-config.h
@@ -16,14 +16,14 @@
 #include <urcu/arch.h>
 #include <string.h>
 
-#include <lttng/ust-align.h>
+#include <lttng/ust-utils.h>
 #include <lttng/ust-compiler.h>
 #include <lttng/ust-tracer.h>
 
 struct lttng_ust_lib_ring_buffer;
 struct lttng_ust_lib_ring_buffer_channel;
 struct lttng_ust_lib_ring_buffer_config;
-struct lttng_ust_lib_ring_buffer_ctx;
+struct lttng_ust_lib_ring_buffer_ctx_private;
 struct lttng_ust_shm_handle;
 
 /*
@@ -96,9 +96,7 @@ struct lttng_ust_lib_ring_buffer_client_cb {
  * alloc/sync pairs:
  *
  * RING_BUFFER_ALLOC_PER_CPU and RING_BUFFER_SYNC_PER_CPU :
- *   Per-cpu buffers with per-cpu synchronization. Tracing must be performed
- *   with preemption disabled (lib_ring_buffer_get_cpu() and
- *   lib_ring_buffer_put_cpu()).
+ *   Per-cpu buffers with per-cpu synchronization.
  *
  * RING_BUFFER_ALLOC_PER_CPU and RING_BUFFER_SYNC_GLOBAL :
  *   Per-cpu buffer with global synchronization. Tracing can be performed with
@@ -223,10 +221,11 @@ struct lttng_ust_lib_ring_buffer_config {
  * lib_ring_buffer_check_config() returns 0 on success.
  * Used internally to check for valid configurations at channel creation.
  */
-static inline lttng_ust_notrace
+static inline
 int lib_ring_buffer_check_config(const struct lttng_ust_lib_ring_buffer_config *config,
 			     unsigned int switch_timer_interval,
-			     unsigned int read_timer_interval);
+			     unsigned int read_timer_interval)
+	lttng_ust_notrace;
 static inline
 int lib_ring_buffer_check_config(const struct lttng_ust_lib_ring_buffer_config *config,
 			     unsigned int switch_timer_interval,