diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-12-08 15:42:17 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-12-08 15:42:47 +0100 |
| commit | 08cd2a6960ae2e1aa7f44b44ebafa84f503a2dd1 (patch) | |
| tree | b8a4f41686c3478f3b938155c866730164b8906c /kernel/trace/ftrace.c | |
| parent | Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| parent | ring-buffer: Fix race between integrity check and readers (diff) | |
| download | linux-08cd2a6960ae2e1aa7f44b44ebafa84f503a2dd1.tar.xz linux-08cd2a6960ae2e1aa7f44b44ebafa84f503a2dd1.zip | |
Merge branch 'tip/perf/urgent-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/urgent
Pull ftrace fixes from Steve Rostedt.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/trace/ftrace.c')
| -rw-r--r-- | kernel/trace/ftrace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 9dcf15d38380..51b71594f321 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -2437,7 +2437,7 @@ static void reset_iter_read(struct ftrace_iterator *iter) { iter->pos = 0; iter->func_pos = 0; - iter->flags &= ~(FTRACE_ITER_PRINTALL & FTRACE_ITER_HASH); + iter->flags &= ~(FTRACE_ITER_PRINTALL | FTRACE_ITER_HASH); } static void *t_start(struct seq_file *m, loff_t *pos) |