diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2016-11-24 02:42:31 +0100 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2016-11-24 02:42:31 +0100 |
| commit | 38e11df134297ea3860c7aad8263ece27db01308 (patch) | |
| tree | c800e9fb51d142fa2b1a56935a2d387fe3a935e2 /kernel/trace | |
| parent | ring-buffer: Froce rb_update_write_stamp() to be inlined (diff) | |
| download | linux-38e11df134297ea3860c7aad8263ece27db01308.tar.xz linux-38e11df134297ea3860c7aad8263ece27db01308.zip | |
ring-buffer: Force rb_end_commit() and rb_set_commit_to_write() inline
Both rb_end_commit() and rb_set_commit_to_write() are in the fast path of
the ring buffer recording. Make sure they are always inlined.
Link: http://lkml.kernel.org/r/20161121183700.GW26852@two.firstfloor.org
Reported-by: Andi Kleen <andi@firstfloor.org>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace')
| -rw-r--r-- | kernel/trace/ring_buffer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 04579a0c7711..f17476f9d7f4 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -2386,7 +2386,7 @@ static void rb_start_commit(struct ring_buffer_per_cpu *cpu_buffer) local_inc(&cpu_buffer->commits); } -static void +static __always_inline void rb_set_commit_to_write(struct ring_buffer_per_cpu *cpu_buffer) { unsigned long max_count; @@ -2441,7 +2441,7 @@ rb_set_commit_to_write(struct ring_buffer_per_cpu *cpu_buffer) goto again; } -static inline void rb_end_commit(struct ring_buffer_per_cpu *cpu_buffer) +static __always_inline void rb_end_commit(struct ring_buffer_per_cpu *cpu_buffer) { unsigned long commits; |