Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/…

…kernel/git/rostedt/linux-2.6-trace into perf/urgent
mariux64 · Mar 23, 2011 · e1eb029 · e1eb029
2 parents fc66c52 + 1106b69
commit e1eb029
Showing 1 changed file with 1 addition and 2 deletions.
diff --git 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;