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

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

Merge branch 'tip/tracing/core' of...

Merge branch 'tip/tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/core
parents c1ab9cab aa27497c
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -1571,7 +1571,7 @@ __find_next_entry(struct trace_iterator *iter, int *ent_cpu,
{
{
	struct ring_buffer *buffer = iter->tr->buffer;
	struct ring_buffer *buffer = iter->tr->buffer;
	struct trace_entry *ent, *next = NULL;
	struct trace_entry *ent, *next = NULL;
	unsigned long lost_events, next_lost = 0;
	unsigned long lost_events = 0, next_lost = 0;
	int cpu_file = iter->cpu_file;
	int cpu_file = iter->cpu_file;
	u64 next_ts = 0, ts;
	u64 next_ts = 0, ts;
	int next_cpu = -1;
	int next_cpu = -1;