Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/…

…kernel/git/rostedt/linux-2.6-trace into perf/urgent
git-mirror · Sep 10, 2010 · 9efdda3 · 9efdda3
2 parents e1d4e08 + df09162
commit 9efdda3
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
@@ -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;
 	}