Lib ring buffer: use TLS for nesting count

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

diff --git a/libringbuffer/frontend_api.h b/libringbuffer/frontend_api.h
index 391e59377905f846b8003d2fc94fd59508198751..ebe5db493f71f220d1d05f9117a9f53bbcf036b6 100644 (file)
--- a/libringbuffer/frontend_api.h
+++ b/libringbuffer/frontend_api.h
@@ -17,8 +17,7 @@
  * Dual LGPL v2.1/GPL v2 license.
  */
 
-#include "../../wrapper/ringbuffer/frontend.h"
-#include <linux/errno.h>
+#include "frontend.h"
 
 /**
  * lib_ring_buffer_get_cpu - Precedes ring buffer reserve/commit.
@@ -41,12 +40,12 @@ int lib_ring_buffer_get_cpu(const struct lib_ring_buffer_config *config)
 
        rcu_read_lock_sched_notrace();
        cpu = smp_processor_id();
-       nesting = ++per_cpu(lib_ring_buffer_nesting, cpu);
+       nesting = ++lib_ring_buffer_nesting;    /* TLS */
        barrier();
 
        if (unlikely(nesting > 4)) {
                WARN_ON_ONCE(1);
-               per_cpu(lib_ring_buffer_nesting, cpu)--;
+               lib_ring_buffer_nesting--;      /* TLS */
                rcu_read_unlock_sched_notrace();
                return -EPERM;
        } else
@@ -60,7 +59,7 @@ static inline
 void lib_ring_buffer_put_cpu(const struct lib_ring_buffer_config *config)
 {
        barrier();
-       __get_cpu_var(lib_ring_buffer_nesting)--;
+       lib_ring_buffer_nesting--;              /* TLS */
        rcu_read_unlock_sched_notrace();
 }