korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-17 01:04:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent

Browse Source
This commit is contained in:
Ingo Molnar 2011-03-23 10:35:17 +01:00
commit e1eb029081
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kernel/trace/ftrace.c
View File

@ -1467,7 +1467,7 @@ t_next(struct seq_file *m, void *v, loff_t *pos)
return t_hash_next(m, pos); return t_hash_next(m, pos);
(*pos)++; (*pos)++;
iter->pos = *pos; iter->pos = iter->func_pos = *pos;
if (iter->flags & FTRACE_ITER_PRINTALL) if (iter->flags & FTRACE_ITER_PRINTALL)
return t_hash_start(m, pos); return t_hash_start(m, pos);
@ -1502,7 +1502,6 @@ t_next(struct seq_file *m, void *v, loff_t *pos)
if (!rec) if (!rec)
return t_hash_start(m, pos); return t_hash_start(m, pos);
iter->func_pos = *pos;
iter->func = rec; iter->func = rec;
return iter; return iter;