aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-09-10 08:05:34 +0200
committerIngo Molnar <mingo@elte.hu>2010-09-10 08:05:34 +0200
commit9efdda310cb26bdc28429cb831c3ec5fa270feb7 (patch)
tree7d544a56502b8b943a1cba667805bde0200063da
parente1d4e08d1fa302f877d9a26d8ce056734b46ca14 (diff)
parentdf09162550fbb53354f0c88e85b5d0e6129ee9cc (diff)
downloadlinux-linaro-9efdda310cb26bdc28429cb831c3ec5fa270feb7.tar.gz
Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent
-rw-r--r--kernel/trace/ftrace.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 83a16e9ee51..fa7ece649fe 100644
--- 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;
}