Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e2026879 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'tip/tracing/ring-buffer-3' of... 

Merge branch 'tip/tracing/ring-buffer-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/core
parents a3578000 8b2c70d1

Documentation/trace/ring-buffer-design.txt

0 → 100644
+955 −0

File added.

Preview size limit exceeded, changes collapsed.

include/linux/ring_buffer.h

+0 −1
Original line number Diff line number Diff line
@@ -170,7 +170,6 @@ unsigned long ring_buffer_overruns(struct ring_buffer *buffer); 
unsigned long ring_buffer_entries_cpu(struct ring_buffer *buffer, int cpu);

unsigned long ring_buffer_overrun_cpu(struct ring_buffer *buffer, int cpu);

unsigned long ring_buffer_commit_overrun_cpu(struct ring_buffer *buffer, int cpu);

unsigned long ring_buffer_nmi_dropped_cpu(struct ring_buffer *buffer, int cpu);



u64 ring_buffer_time_stamp(struct ring_buffer *buffer, int cpu);

void ring_buffer_normalize_time_stamp(struct ring_buffer *buffer,

kernel/trace/ring_buffer.c

+770 −165

File changed.

Preview size limit exceeded, changes collapsed.

kernel/trace/trace.c

+0 −3
Original line number Diff line number Diff line
@@ -3630,9 +3630,6 @@ tracing_stats_read(struct file *filp, char __user *ubuf, 
	cnt = ring_buffer_commit_overrun_cpu(tr->buffer, cpu);

	trace_seq_printf(s, "commit overrun: %ld\n", cnt);



	cnt = ring_buffer_nmi_dropped_cpu(tr->buffer, cpu);

	trace_seq_printf(s, "nmi dropped: %ld\n", cnt);



	count = simple_read_from_buffer(ubuf, count, ppos, s->buffer, s->len);



	kfree(s);