diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-10-19 20:41:38 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-10-19 20:41:38 +0200 |
| commit | 750ed158bf6c782d2813da1bca2c824365a0b777 (patch) | |
| tree | 49bc9fb43e5211c97c8e572cb5b6b9352ea1aa14 /kernel/trace/ftrace.c | |
| parent | 3f7edb1656e5beba2b5e617d31e4064e1eed0bc0 (diff) | |
| parent | 7e40798f406fe73f9bac496a390daabd8768a8f7 (diff) | |
| download | lwn-750ed158bf6c782d2813da1bca2c824365a0b777.tar.gz lwn-750ed158bf6c782d2813da1bca2c824365a0b777.zip | |
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
Diffstat (limited to 'kernel/trace/ftrace.c')
| -rw-r--r-- | kernel/trace/ftrace.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 65fb077ea79c..ebd80d50c474 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -1638,8 +1638,8 @@ ftrace_failures_open(struct inode *inode, struct file *file) ret = ftrace_avail_open(inode, file); if (!ret) { - m = (struct seq_file *)file->private_data; - iter = (struct ftrace_iterator *)m->private; + m = file->private_data; + iter = m->private; iter->flags = FTRACE_ITER_FAILURES; } |