Merge branch 'master' into dev

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

diff --git a/libringbuffer/vatomic.h b/libringbuffer/vatomic.h
index 831ea0431a00777f724e4dc9587a263d20d31b47..29bb67d7cc0f405ca579dc74898381e1e61c450c 100644 (file)
--- a/libringbuffer/vatomic.h
+++ b/libringbuffer/vatomic.h
@@ -6,7 +6,14 @@
  *
  * Copyright (C) 2010 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * Dual LGPL v2.1/GPL v2 license.
+ * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
+ * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
+ *
+ * Permission is hereby granted to use or copy this program
+ * for any purpose,  provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
  */
 
 #include <assert.h>
@@ -26,14 +33,14 @@ union v_atomic {
 };
 
 static inline
-long v_read(const struct lib_ring_buffer_config *config, union v_atomic *v_a)
+long v_read(const struct lttng_ust_lib_ring_buffer_config *config, union v_atomic *v_a)
 {
        assert(config->sync != RING_BUFFER_SYNC_PER_CPU);
        return uatomic_read(&v_a->a);
 }
 
 static inline
-void v_set(const struct lib_ring_buffer_config *config, union v_atomic *v_a,
+void v_set(const struct lttng_ust_lib_ring_buffer_config *config, union v_atomic *v_a,
           long v)
 {
        assert(config->sync != RING_BUFFER_SYNC_PER_CPU);
@@ -41,14 +48,14 @@ void v_set(const struct lib_ring_buffer_config *config, union v_atomic *v_a,
 }
 
 static inline
-void v_add(const struct lib_ring_buffer_config *config, long v, union v_atomic *v_a)
+void v_add(const struct lttng_ust_lib_ring_buffer_config *config, long v, union v_atomic *v_a)
 {
        assert(config->sync != RING_BUFFER_SYNC_PER_CPU);
        uatomic_add(&v_a->a, v);
 }
 
 static inline
-void v_inc(const struct lib_ring_buffer_config *config, union v_atomic *v_a)
+void v_inc(const struct lttng_ust_lib_ring_buffer_config *config, union v_atomic *v_a)
 {
        assert(config->sync != RING_BUFFER_SYNC_PER_CPU);
        uatomic_inc(&v_a->a);
@@ -58,13 +65,13 @@ void v_inc(const struct lib_ring_buffer_config *config, union v_atomic *v_a)
  * Non-atomic decrement. Only used by reader, apply to reader-owned subbuffer.
  */
 static inline
-void _v_dec(const struct lib_ring_buffer_config *config, union v_atomic *v_a)
+void _v_dec(const struct lttng_ust_lib_ring_buffer_config *config, union v_atomic *v_a)
 {
        --v_a->v;
 }
 
 static inline
-long v_cmpxchg(const struct lib_ring_buffer_config *config, union v_atomic *v_a,
+long v_cmpxchg(const struct lttng_ust_lib_ring_buffer_config *config, union v_atomic *v_a,
               long old, long _new)
 {
        assert(config->sync != RING_BUFFER_SYNC_PER_CPU);