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

Commit e1eb0290 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 fc66c521 1106b699

kernel/trace/ftrace.c

+1 −2
Original line number Diff line number Diff line
@@ -1467,7 +1467,7 @@ t_next(struct seq_file *m, void *v, loff_t *pos) 
		return t_hash_next(m, pos);



	(*pos)++;

	iter->pos = *pos;

	iter->pos = iter->func_pos = *pos;



	if (iter->flags & FTRACE_ITER_PRINTALL)

		return t_hash_start(m, pos);
@@ -1502,7 +1502,6 @@ t_next(struct seq_file *m, void *v, loff_t *pos) 
	if (!rec)

		return t_hash_start(m, pos);



	iter->func_pos = *pos;

	iter->func = rec;



	return iter;