diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2010-09-10 08:05:34 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-09-10 08:05:34 +0200 |
| commit | 9efdda310cb26bdc28429cb831c3ec5fa270feb7 (patch) | |
| tree | 7d544a56502b8b943a1cba667805bde0200063da | |
| parent | Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/urgent (diff) | |
| parent | tracing: t_start: reset FTRACE_ITER_HASH in case of seek/pread (diff) | |
| download | linux-dev-9efdda310cb26bdc28429cb831c3ec5fa270feb7.tar.xz linux-dev-9efdda310cb26bdc28429cb831c3ec5fa270feb7.zip | |
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.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 83a16e9ee518..fa7ece649fe1 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; } |