projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: lttng_this_cpu_ptr wrapper for kernel 3.19+
[lttng-modules.git]
/
lib
/
ringbuffer
/
ring_buffer_frontend.c
diff --git
a/lib/ringbuffer/ring_buffer_frontend.c
b/lib/ringbuffer/ring_buffer_frontend.c
index ae0b9e3986267a8b79e8395d13cd23d55cc357c7..c4b797ce8af76faf9ba5209d054b89fb42326656 100644
(file)
--- a/
lib/ringbuffer/ring_buffer_frontend.c
+++ b/
lib/ringbuffer/ring_buffer_frontend.c
@@
-61,6
+61,7
@@
#include "../../wrapper/ringbuffer/iterator.h"
#include "../../wrapper/ringbuffer/nohz.h"
#include "../../wrapper/atomic.h"
#include "../../wrapper/ringbuffer/iterator.h"
#include "../../wrapper/ringbuffer/nohz.h"
#include "../../wrapper/atomic.h"
+#include "../../wrapper/percpu-defs.h"
/*
* Internal structure representing offsets to use at a sub-buffer switch.
/*
* Internal structure representing offsets to use at a sub-buffer switch.
@@
-498,16
+499,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:
raw_spin_unlock(&buf->raw_tick_nohz_spinlock);
break;
case TICK_NOHZ_STOP:
- spin_lock(
&__get_cpu_var(
ring_buffer_nohz_lock));
+ spin_lock(
lttng_this_cpu_ptr(&
ring_buffer_nohz_lock));
lib_ring_buffer_stop_switch_timer(buf);
lib_ring_buffer_stop_read_timer(buf);
lib_ring_buffer_stop_switch_timer(buf);
lib_ring_buffer_stop_read_timer(buf);
- spin_unlock(
&__get_cpu_var(
ring_buffer_nohz_lock));
+ spin_unlock(
lttng_this_cpu_ptr(&
ring_buffer_nohz_lock));
break;
case TICK_NOHZ_RESTART:
break;
case TICK_NOHZ_RESTART:
- spin_lock(
&__get_cpu_var(
ring_buffer_nohz_lock));
+ spin_lock(
lttng_this_cpu_ptr(&
ring_buffer_nohz_lock));
lib_ring_buffer_start_read_timer(buf);
lib_ring_buffer_start_switch_timer(buf);
lib_ring_buffer_start_read_timer(buf);
lib_ring_buffer_start_switch_timer(buf);
- spin_unlock(
&__get_cpu_var(
ring_buffer_nohz_lock));
+ spin_unlock(
lttng_this_cpu_ptr(&
ring_buffer_nohz_lock));
break;
}
break;
}
This page took
0.024058 seconds
and
4
git commands to generate.