aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2011-03-23 10:35:17 +0100
committerIngo Molnar <mingo@elte.hu>2011-03-23 10:35:17 +0100
commite1eb029081f9cd4f73bdd05d495e5011839546f5 (patch)
tree31686542695d0932ec09c8197db0ad94c30d7d33 /kernel
parentfc66c5210ec2539e800e87d7b3a985323c7be96e (diff)
parent1106b6997df7d0c0487e21fd9c9dd2ce3d4a52db (diff)
downloadkernel_samsung_aries-e1eb029081f9cd4f73bdd05d495e5011839546f5.zip
kernel_samsung_aries-e1eb029081f9cd4f73bdd05d495e5011839546f5.tar.gz
kernel_samsung_aries-e1eb029081f9cd4f73bdd05d495e5011839546f5.tar.bz2
Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent
Diffstat (limited to 'kernel')
-rw-r--r--kernel/trace/ftrace.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 888b611..c075f4e 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -1467,7 +1467,7 @@ t_next(struct seq_file *m, void *v, loff_t *pos)
return t_hash_next(m, pos);
(*pos)++;
- iter->pos = *pos;
+ iter->pos = iter->func_pos = *pos;
if (iter->flags & FTRACE_ITER_PRINTALL)
return t_hash_start(m, pos);
@@ -1502,7 +1502,6 @@ t_next(struct seq_file *m, void *v, loff_t *pos)
if (!rec)
return t_hash_start(m, pos);
- iter->func_pos = *pos;
iter->func = rec;
return iter;