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

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

Merge branch 'tip/perf/urgent' of...

Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent
parents 5f127133 db5e7ecc
Loading
Loading
Loading
Loading
+1 −4
Original line number Diff line number Diff line
@@ -240,13 +240,10 @@ static const char **find_next(void *v, loff_t *pos)
	const char **fmt = v;
	int start_index;

	if (!fmt)
		fmt = __start___trace_bprintk_fmt + *pos;

	start_index = __stop___trace_bprintk_fmt - __start___trace_bprintk_fmt;

	if (*pos < start_index)
		return fmt;
		return __start___trace_bprintk_fmt + *pos;

	return find_next_mod_format(start_index, v, fmt, pos);
}