X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lib%2Fringbuffer%2Fring_buffer_frontend.c;h=8c9e5ef768857393e2c93c796ca4194ecb3f169a;hb=46e25482873e8c85b547db4cec1734f127b27488;hp=664e8652012fece589dac16b1ca3338113a8f9ed;hpb=c319299a028c5dba8c2a413acc35f930f4b72cbc;p=lttng-modules.git

diff --git a/lib/ringbuffer/ring_buffer_frontend.c b/lib/ringbuffer/ring_buffer_frontend.c
index 664e8652..8c9e5ef7 100644
--- a/lib/ringbuffer/ring_buffer_frontend.c
+++ b/lib/ringbuffer/ring_buffer_frontend.c
@@ -41,6 +41,7 @@
 #include <linux/module.h>
 #include <linux/percpu.h>
 #include <linux/kref.h>
+#include <linux/percpu-defs.h>
 #include <asm/cacheflush.h>
 
 #include <wrapper/ringbuffer/config.h>
@@ -49,7 +50,6 @@
 #include <wrapper/ringbuffer/iterator.h>
 #include <wrapper/ringbuffer/nohz.h>
 #include <wrapper/atomic.h>
-#include <wrapper/percpu-defs.h>
 #include <wrapper/timer.h>
 
 /*
@@ -633,16 +633,16 @@ static int notrace ring_buffer_tick_nohz_callback(struct notifier_block *nb,
 		raw_spin_unlock(&buf->raw_tick_nohz_spinlock);
 		break;
 	case TICK_NOHZ_STOP:
-		spin_lock(lttng_this_cpu_ptr(&ring_buffer_nohz_lock));
+		spin_lock(this_cpu_ptr(&ring_buffer_nohz_lock));
 		lib_ring_buffer_stop_switch_timer(buf);
 		lib_ring_buffer_stop_read_timer(buf);
-		spin_unlock(lttng_this_cpu_ptr(&ring_buffer_nohz_lock));
+		spin_unlock(this_cpu_ptr(&ring_buffer_nohz_lock));
 		break;
 	case TICK_NOHZ_RESTART:
-		spin_lock(lttng_this_cpu_ptr(&ring_buffer_nohz_lock));
+		spin_lock(this_cpu_ptr(&ring_buffer_nohz_lock));
 		lib_ring_buffer_start_read_timer(buf);
 		lib_ring_buffer_start_switch_timer(buf);
-		spin_unlock(lttng_this_cpu_ptr(&ring_buffer_nohz_lock));
+		spin_unlock(this_cpu_ptr(&ring_buffer_nohz_lock));
 		break;
 	}