Commit 9efdda31 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 e1d4e08d df091625

kernel/trace/ftrace.c

+2 −0
Original line number Diff line number Diff line
@@ -1510,6 +1510,8 @@ static void *t_start(struct seq_file *m, loff_t *pos) 
		if (*pos > 0)

			return t_hash_start(m, pos);

		iter->flags |= FTRACE_ITER_PRINTALL;

		/* reset in case of seek/pread */

		iter->flags &= ~FTRACE_ITER_HASH;

		return iter;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE